diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-01-06 09:11:48 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-01-06 09:11:48 +0100 |
| commit | f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872 (patch) | |
| tree | f06c87479be60f3c601cbeed6088e6e74d97785c /mod/item.php | |
| parent | efe308b5ac9ac7e8d399fb880f31b6967de8fec1 (diff) | |
| parent | c3ada095f4156bba01e77d2d250d5821ba5e859e (diff) | |
| download | volse-hubzilla-f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872.tar.gz volse-hubzilla-f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872.tar.bz2 volse-hubzilla-f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872.zip | |
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mod/item.php b/mod/item.php index d4d337584..6b294b93e 100644 --- a/mod/item.php +++ b/mod/item.php @@ -586,11 +586,9 @@ function item_post(&$a) { // preview mode - prepare the body for display and send it via json if($preview) { - $b = prepare_body($datarray,true); require_once('include/conversation.php'); - $o = conversation(&$a,array(array_merge($datarray,$contact_record)),'search',false); - $json = array('preview' => $o); - echo json_encode($json); + $o = conversation(&$a,array(array_merge($contact_record,$datarray)),'search',false,true); + echo json_encode(array('preview' => $o)); killme(); } |