clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Domovoy 2012-08-11 17:51:25 +02:00
parent 7c2ed027ff
commit 1c36d14673
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
object/Conversation.php
View File

@ -54,7 +54,7 @@ class Conversation extends BaseObject {
$result = array(); $result = array();
foreach($this->threads as $item) { 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; continue;
$item_data = $item->get_template_data($cmnt_tpl, $this->mode, $alike, $dlike); $item_data = $item->get_template_data($cmnt_tpl, $this->mode, $alike, $dlike);
if(!$item_data) { if(!$item_data) {

16
object/Item.php
View File

@ -107,7 +107,7 @@ class Item extends BaseObject {
if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
$profile_avatar = $a->contacts[$normalised]['thumb']; $profile_avatar = $a->contacts[$normalised]['thumb'];
else 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' => ''); $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
call_hooks('render_location',$locate); call_hooks('render_location',$locate);
@ -334,18 +334,6 @@ class Item extends BaseObject {
public function get_id() { public function get_id() {
return $this->get_data_value('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 * Add a child item
@ -434,7 +422,7 @@ class Item extends BaseObject {
* _ value on success * _ value on success
* _ false on failure * _ false on failure
*/ */
private function get_data_value($name) { public function get_data_value($name) {
if(!x($this->data, $name)) { if(!x($this->data, $name)) {
logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG); logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
return false; return false;