quattro: fix PM aside template

[friendica.git] / object / Conversation.php

diff --git a/object/Conversation.php b/object/Conversation.php
index 2b65ba468113c3c9778a43b631441d28768afc1e..94eed94d5f9eaa8661d6a9508b4be21a0512ff90 100644 (file)
--- a/object/Conversation.php
+++ b/object/Conversation.php
@@ -87,8 +87,8 @@ class Conversation extends BaseObject {
         * Add a thread to the conversation
         *
         * Returns:
-        *              _ The inserted item on success
-        *              _ false on failure
+        *      _ The inserted item on success
+        *      _ false on failure
         */
        public function add_thread($item) {
                $item_id = $item->get_id();
@@ -123,16 +123,21 @@ class Conversation extends BaseObject {
         * We should find a way to avoid using those arguments (at least most of them)
         *
         * Returns:
-        *              _ The data requested on success
-        *              _ false on failure
+        *      _ The data requested on success
+        *      _ false on failure
         */
-       public function get_template_data($alike, $dlike) {
+       public function get_template_data($conv_responses) {
+               global $a;
                $result = array();
 
+               $i = 0;
+
                foreach($this->threads as $item) {
                        if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid'))
                                continue;
-                       $item_data = $item->get_template_data($alike, $dlike);
+
+                       $item_data = $item->get_template_data($conv_responses);
+
                        if(!$item_data) {
                                logger('[ERROR] Conversation::get_template_data : Failed to get item template data ('. $item->get_id() .').', LOGGER_DEBUG);
                                return false;
@@ -140,6 +145,7 @@ class Conversation extends BaseObject {
                        $result[] = $item_data;
                }
 
+               //$a->mark_timestamp();
                return $result;
        }
 
@@ -147,8 +153,8 @@ class Conversation extends BaseObject {
         * Get a thread based on its item id
         *
         * Returns:
-        *              _ The found item on success
-        *              _ false on failure
+        *      _ The found item on success
+        *      _ false on failure
         */
        private function get_thread($id) {
                foreach($this->threads as $item) {