Merge branch 'pull'

This commit is contained in:
friendica 2012-03-14 14:34:52 -07:00
commit dcdfa96a1f
8 changed files with 190 additions and 8 deletions

View file

@ -627,7 +627,7 @@ function item_post(&$a) {
if($preview) {
require_once('include/conversation.php');
$o = conversation(&$a,array(array_merge($contact_record,$datarray)),'search',false,true);
$o = conversation($a,array(array_merge($contact_record,$datarray)),'search',false,true);
logger('preview: ' . $o);
echo json_encode(array('preview' => $o));
killme();