jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some fixes

Browse source
This commit is contained in:
Domovoy 2012-08-12 17:34:02 +02:00
parent b1a801fe61
commit d4f44b1530
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
object/Item.php
View file

@ -133,6 +133,7 @@ class Item extends BaseObject {
* Maybe we should establish a way to be notified about conversation changes * Maybe we should establish a way to be notified about conversation changes
*/ */
$this->check_wall_to_wall(); $this->check_wall_to_wall();
if($this->is_wall_to_wall() && ($this->get_owner_url() == $this->get_redirect_url())) if($this->is_wall_to_wall() && ($this->get_owner_url() == $this->get_redirect_url()))
$osparkle = ' sparkle'; $osparkle = ' sparkle';
@ -171,7 +172,6 @@ class Item extends BaseObject {
$body = prepare_body($item,true); $body = prepare_body($item,true);
$tmp_item = array( $tmp_item = array(
// template to use to render item (wall, walltowall, search)
'template' => $this->get_template(), 'template' => $this->get_template(),
'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
@ -207,7 +207,7 @@ class Item extends BaseObject {
'vote' => $buttons, 'vote' => $buttons,
'like' => $like, 'like' => $like,
'dislike' => $dislike, 'dislike' => $dislike,
'comment' => $this->get_comment_box($commentww), 'comment' => $this->get_comment_box(),
'previewing' => $previewing, 'previewing' => $previewing,
'wait' => t('Please wait'), 'wait' => t('Please wait'),
); );
@ -221,7 +221,7 @@ class Item extends BaseObject {
$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($children as $child) {
$result['children'][] = $child->get_template_data($alike, $dlike, $thread_level + 1); $result['children'][] = $child->get_template_data($alike, $dlike, $thread_level + 1);
} }
// Collapse // Collapse
@ -443,7 +443,7 @@ class Item extends BaseObject {
* _ The comment box string (empty if no comment box) * _ The comment box string (empty if no comment box)
* _ false on failure * _ false on failure
*/ */
private function get_comment_box($ww) { private function get_comment_box() {
if(!$this->is_toplevel() && !get_config('system','thread_allow')) { if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
return ''; return '';
} }