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

Conflicts:
	include/conversation.php

diff --cc include/conversation.php
index 7d9dfa1e74bb874d064e6c7659c79d330563fef6,adc198412e2900380dccd7324aa9a1ec621fbbf7..06d06cb5a32575182217211cd830e49d1602f047
--- 1/include/conversation.php
--- 2/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);
                }
        }