From: Domovoy <domovoy@errlock.org>
Date: Sat, 11 Aug 2012 14:42:47 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d817117f6e43ad2ce6957798681f6e4133433f52;p=friendica.git

Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

Conflicts:
	include/conversation.php
---

d817117f6e43ad2ce6957798681f6e4133433f52
diff --cc include/conversation.php
index 7d9dfa1e74,adc198412e..06d06cb5a3
--- a/include/conversation.php
+++ b/include/conversation.php
@@@ -845,20 -855,16 +860,22 @@@ function conversation(&$a, $items, $mod
  
  			$threads = array();
  			foreach($items as $item) {
+ 
+ 				like_puller($a,$item,$alike,'like');
+ 				like_puller($a,$item,$dlike,'dislike');
+ 
  				if($item['id'] == $item['parent']) {
- 					// $threads[] = $item;
 -					$threads[] = $item;
 +					$item_object = new Item($item);
 +					$conv->add_thread($item_object);
  				}
  			}
  
- 			//$threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner);
- 			$threads = $conv->get_template_data($cmnt_tpl);
 -			$threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode,  $profile_owner, $alike, $dlike);
++			$threads = $conv->get_template_data($cmnt_tpl, $alike, $dlike);
 +			if(!$threads) {
 +				logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
 +				$threads = array();
 +			}
 +			logger('[DEBUG] conversation : $threads = '. print_r($threads, true), LOGGER_DEBUG);
  		}
  	}