Merge https://github.com/friendica/friendica into pull

2012-03-14 14:34:48 -07:00
parent fb77bfa648 c95deb4839
commit 2dc527609e
8 changed files with 190 additions and 8 deletions
@@ -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();