Merge branch 'develop' into utf8mb4

[friendica.git] / object / Conversation.php

diff --git a/object/Conversation.php b/object/Conversation.php
index 94eed94d5f9eaa8661d6a9508b4be21a0512ff90..eb5b3b9b486985fe67bc0c8958cb3f33912293c8 100644 (file)
--- a/object/Conversation.php
+++ b/object/Conversation.php
@@ -127,7 +127,7 @@ class Conversation extends BaseObject {
         *      _ false on failure
         */
        public function get_template_data($conv_responses) {
-               global $a;
+               $a = get_app();
                $result = array();
 
                $i = 0;
@@ -145,7 +145,6 @@ class Conversation extends BaseObject {
                        $result[] = $item_data;
                }
 
-               //$a->mark_timestamp();
                return $result;
        }