MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rename $item_result to $result

Browse source
This commit is contained in:
Domovoy 2012-08-12 16:32:02 +02:00
parent 4e4774ff4f
commit c8cf87efc4
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
object/Item.php
View file

@ -249,43 +249,41 @@ class Item extends BaseObject {
$arr = array('item' => $item, 'output' => $tmp_item); $arr = array('item' => $item, 'output' => $tmp_item);
call_hooks('display_item', $arr); call_hooks('display_item', $arr);
$item_result = $arr['output']; $result = $arr['output'];
$item_result['children'] = array(); $result['children'] = array();
$children = $this->get_children(); $children = $this->get_children();
$nb_children = count($children); $nb_children = count($children);
if($nb_children > 0) { if($nb_children > 0) {
foreach($this->get_children() as $child) { foreach($this->get_children() as $child) {
$item_result['children'][] = $child->get_template_data($alike, $dlike, $thread_level + 1); $result['children'][] = $child->get_template_data($alike, $dlike, $thread_level + 1);
} }
// Collapse // Collapse
if(($nb_children > 2) || ($thread_level > 1)) { if(($nb_children > 2) || ($thread_level > 1)) {
$item_result['children'][0]['comment_firstcollapsed'] = true; $result['children'][0]['comment_firstcollapsed'] = true;
$item_result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children ); $result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
$item_result['children'][0]['hide_text'] = t('show more'); $result['children'][0]['hide_text'] = t('show more');
if($thread_level > 1) { if($thread_level > 1) {
$item_result['children'][$nb_children - 1]['comment_lastcollapsed'] = true; $result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
} }
else { else {
$item_result['children'][$nb_children - 3]['comment_lastcollapsed'] = true; $result['children'][$nb_children - 3]['comment_lastcollapsed'] = true;
} }
} }
} }
$item_result['private'] = $item['private']; $result['private'] = $item['private'];
$item_result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : ''); $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
if(get_config('system','thread_allow')) { if(get_config('system','thread_allow')) {
$item_result['flatten'] = false; $result['flatten'] = false;
$item_result['threaded'] = true; $result['threaded'] = true;
} }
else { else {
$item_result['flatten'] = true; $result['flatten'] = true;
$item_result['threaded'] = false; $result['threaded'] = false;
} }
$result = $item_result;
return $result; return $result;
} }