From: Domovoy <domovoy@errlock.org>
Date: Sat, 11 Aug 2012 15:51:25 +0000 (+0200)
Subject: Got of the get_* function about data, use get_data_value instead (except for get_id... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1c36d14673c057cb8b49621b0d50d3fd4811f1f9;p=friendica.git

Got of the get_* function about data, use get_data_value instead (except for get_id, which is very conveniant).
---

diff --git a/object/Conversation.php b/object/Conversation.php
index 6675a00530..a42e6d038d 100644
--- a/object/Conversation.php
+++ b/object/Conversation.php
@@ -54,7 +54,7 @@ class Conversation extends BaseObject {
 		$result = array();
 
 		foreach($this->threads as $item) {
-			if($item->get_network() === NETWORK_MAIL && local_user() != $item->get_uid())
+			if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid'))
 				continue;
 			$item_data = $item->get_template_data($cmnt_tpl, $this->mode, $alike, $dlike);
 			if(!$item_data) {
diff --git a/object/Item.php b/object/Item.php
index a9115ee08e..8deabb1b61 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -107,7 +107,7 @@ class Item extends BaseObject {
 		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->get_cached_avatar_image($this->get_thumb()));
+			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($this->get_data_value('thumb')));
 
 		$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
 		call_hooks('render_location',$locate);
@@ -334,18 +334,6 @@ class Item extends BaseObject {
 	public function get_id() {
 		return $this->get_data_value('id');
 	}
-	
-	public function get_network() {
-		return $this->get_data_value('network');
-	}
-	
-	public function get_uid() {
-		return $this->get_data_value('uid');
-	}
-	
-	public function get_thumb() {
-		return $this->get_data_value('thumb');
-	}
 
 	/**
 	 * Add a child item
@@ -434,7 +422,7 @@ class Item extends BaseObject {
 	 * 		_ value on success
 	 * 		_ false on failure
 	 */
-	private function get_data_value($name) {
+	public function get_data_value($name) {
 		if(!x($this->data, $name)) {
 			logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
 			return false;