X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=object%2FConversation.php;h=f03b3b1c1bc00cfbada58c7f0a93495d3394bd78;hb=67e32ce85986d52a029cae07bfb32b32a598ceab;hp=fd1e282cabf6ce7525c40e80c73d05b3d2938ccc;hpb=c19092c4566755609307547e4ad5038de0253841;p=friendica.git

diff --git a/object/Conversation.php b/object/Conversation.php
index fd1e282cab..f03b3b1c1b 100644
--- a/object/Conversation.php
+++ b/object/Conversation.php
@@ -126,8 +126,8 @@ class Conversation extends BaseObject {
 	 *      _ The data requested on success
 	 *      _ false on failure
 	 */
-	public function get_template_data($alike, $dlike) {
-		global $a;
+	public function get_template_data($conv_responses) {
+		$a = get_app();
 		$result = array();
 
 		$i = 0;
@@ -136,7 +136,7 @@ class Conversation extends BaseObject {
 			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);
@@ -145,7 +145,6 @@ class Conversation extends BaseObject {
 			$result[] = $item_data;
 		}
 
-		//$a->mark_timestamp();
 		return $result;
 	}
 
@@ -165,4 +164,3 @@ class Conversation extends BaseObject {
 		return false;
 	}
 }
-?>