rev update

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index 2c9d65598117c05f0d27e1817cb85c7f66ae9020..134dbd643b18e8ca1b91b2a1410bac6282f44cdf 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -63,7 +63,7 @@ class Item extends BaseObject {
                                if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
                                        continue;
                                }
-                               if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
+                               if(! visible_activity($item)) {
                                        continue;
                                }
                                $child = new Item($item);
@@ -112,6 +112,7 @@ class Item extends BaseObject {
 
                $drop = array(
                        'dropping' => $dropping,
+                       'pagedrop' => $item['pagedrop'],
                        'select' => t('Select'), 
                        'delete' => t('Delete'),
                );
@@ -214,6 +215,10 @@ class Item extends BaseObject {
                        'tags' => $tags,
             'hashtags' => $hashtags,
             'mentions' => $mentions,
+                       'txt_cats' => t('Categories:'),
+                       'txt_folders' => t('Filed under:'),
+                       'has_cats' => ((count($categories)) ? 'true' : ''),
+                       'has_folders' => ((count($folders)) ? 'true' : ''),
             'categories' => $categories,
             'folders' => $folders,            
                        'body' => template_escape($body),
@@ -327,11 +332,9 @@ class Item extends BaseObject {
                 * Only add what will be displayed
                 */
                if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
-                       logger('[WARN] Item::add_child : Item is a mail ('. $item->get_id() .').', LOGGER_DEBUG);
                        return false;
                }
-               if($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) {
-                       logger('[WARN] Item::add_child : Item is a (dis)like ('. $item->get_id() .').', LOGGER_DEBUG);
+               if(activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) {
                        return false;
                }
                
@@ -594,7 +597,6 @@ class Item extends BaseObject {
                                        $this->owner_url = zrl($a->page_contact['url']);
                                        $this->owner_photo = $a->page_contact['thumb'];
                                        $this->owner_name = $a->page_contact['name'];
-                                       $this->set_template('wall2wall');
                                        $this->wall_to_wall = true;
                                }
                                else if($this->get_data_value('owner-link')) {
@@ -616,7 +618,6 @@ class Item extends BaseObject {
 
                                                $this->owner_photo = $this->get_data_value('owner-avatar');
                                                $this->owner_name = $this->get_data_value('owner-name');
-                                               $this->set_template('wall2wall');
                                                $this->wall_to_wall = true;
                                                // If it is our contact, use a friendly redirect link
                                                if((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url'))) 
@@ -657,5 +658,9 @@ class Item extends BaseObject {
        private function is_visiting() {
                return $this->visiting;
        }
+
+
+
+
 }
 ?>