X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=object%2FItem.php;h=9f01ac59b08af0b0c4bd86fbfff7d6da7b9f62f2;hb=13150c09a56de662677ee17a1614a2ee55931890;hp=e9c96cf159311f888ec9b96f0a8941cc81ded38a;hpb=507f8ab4dfb1a31c97160f6f4ed1315f548d2642;p=friendica.git

diff --git a/object/Item.php b/object/Item.php
index e9c96cf159..9f01ac59b0 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -89,14 +89,14 @@ class Item extends BaseObject {
 		$a = $this->get_app();
 
 		$item = $this->get_data();
-                $edited = false;
-                if (strcmp($item['created'], $item['edited'])<>0) {
-                      $edited = array(
-                          'label' => t('This entry was edited'),
-                          'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),
-                          'relative' => relative_date($item['edited'])
-                      );
-                }
+		$edited = false;
+		if (strcmp($item['created'], $item['edited'])<>0) {
+		      $edited = array(
+			  'label' => t('This entry was edited'),
+			  'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),
+			  'relative' => relative_date($item['edited'])
+		      );
+		}
 		$commentww = '';
 		$sparkle = '';
 		$buttons = '';
@@ -150,11 +150,21 @@ class Item extends BaseObject {
 		else
 			$profile_link = zrl($profile_link);
 
-		$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
-		if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
-			$profile_avatar = $a->contacts[$normalised]['thumb'];
-		else
-			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->remove_baseurl($this->get_data_value('thumb')));
+		if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) {
+			$author_contact = get_contact_details_by_url($item['author-link'], $conv->get_profile_owner());
+			if ($author_contact["thumb"])
+				$item['author-thumb'] = $author_contact["thumb"];
+			else
+				$item['author-thumb'] = $item['author-avatar'];
+		}
+
+		if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
+			$owner_contact = get_contact_details_by_url($item['owner-link'], $conv->get_profile_owner());
+			if ($owner_contact["thumb"])
+				$item['owner-thumb'] = $owner_contact["thumb"];
+			else
+				$item['owner-thumb'] = $item['owner-avatar'];
+		}
 
 		$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
 		call_hooks('render_location',$locate);
@@ -324,7 +334,7 @@ class Item extends BaseObject {
 
 		// Diaspora isn't able to do likes on comments - but red does
 		if (($item["item_network"] == NETWORK_DIASPORA) AND ($indent == 'comment') AND
-			!diaspora_is_redmatrix($item["owner-link"]) AND isset($buttons["like"]))
+			!diaspora::is_redmatrix($item["owner-link"]) AND isset($buttons["like"]))
 			unset($buttons["like"]);
 
 		// Diaspora doesn't has multithreaded comments
@@ -363,7 +373,7 @@ class Item extends BaseObject {
 			'profile_url' => $profile_link,
 			'item_photo_menu' => item_photo_menu($item),
 			'name' => $name_e,
-			'thumb' => proxy_url($profile_avatar, false, PROXY_SIZE_THUMB),
+			'thumb' => $a->remove_baseurl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
 			'osparkle' => $osparkle,
 			'sparkle' => $sparkle,
 			'title' => $title_e,
@@ -376,7 +386,7 @@ class Item extends BaseObject {
 			'indent' => $indent,
 			'shiny' => $shiny,
 			'owner_url' => $this->get_owner_url(),
-			'owner_photo' => proxy_url($this->get_owner_photo(), false, PROXY_SIZE_THUMB),
+			'owner_photo' => $a->remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
 			'owner_name' => htmlentities($owner_name_e),
 			'plink' => get_plink($item),
 			'edpost'    => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
@@ -429,10 +439,10 @@ class Item extends BaseObject {
 			}
 		}
 
-        if ($this->is_toplevel()) {
-            $result['total_comments_num'] = "$total_children";
-            $result['total_comments_text'] = tt('comment', 'comments', $total_children);
-        }
+	if ($this->is_toplevel()) {
+	    $result['total_comments_num'] = "$total_children";
+	    $result['total_comments_text'] = tt('comment', 'comments', $total_children);
+	}
 
 		$result['private'] = $item['private'];
 		$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');