quattro: fix shiny items with threads. fix 'tagged' template

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index a0adb1346f2e94439e905791185190350046e180..b8afe2213a547651b49607a973ef5f542157683a 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);
@@ -93,6 +93,7 @@ class Item extends BaseObject {
                $star = false;
                $isstarred = "unstarred";
                $indent = '';
+               $shiny = '';
                $osparkle = '';
                $total_children = $this->count_descendants();
 
@@ -199,8 +200,9 @@ class Item extends BaseObject {
                        if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
                }
 
-               if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-                       $indent .= ' shiny';
+               if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0){
+                       $shiny = 'shiny';
+               }
 
                localize_item($item);
 
@@ -241,6 +243,7 @@ class Item extends BaseObject {
                        'lock' => $lock,
                        'location' => template_escape($location),
                        'indent' => $indent,
+                       'shiny' => $shiny,
                        'owner_url' => $this->get_owner_url(),
                        'owner_photo' => $this->get_owner_photo(),
                        'owner_name' => template_escape($this->get_owner_name()),
@@ -288,7 +291,7 @@ class Item extends BaseObject {
                }
                
         if ($this->is_toplevel()) {
-            $result['total_comments_num'] = $total_children;
+            $result['total_comments_num'] = "$total_children";
             $result['total_comments_text'] = tt('comment', 'comments', $total_children);
         }
         
@@ -332,11 +335,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;
                }
                
@@ -521,7 +522,8 @@ class Item extends BaseObject {
         *      _ false on failure
         */
        private function get_comment_box($indent) {
-               if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
+               $a = $this->get_app();
+               if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) {
                        return '';
                }
                
@@ -533,7 +535,6 @@ class Item extends BaseObject {
                        $ww = 'ww';
 
                if($conv->is_writable() && $this->is_writable()) {
-                       $a = $this->get_app();
                        $qc = $qcomment =  null;
 
                        /*
@@ -547,7 +548,8 @@ class Item extends BaseObject {
                        $comment_box = replace_macros($template,array(
                                '$return_path' => '',
                                '$threaded' => $this->is_threaded(),
-                               '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
+//                             '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
+                               '$jsreload' => '',
                                '$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'),
                                '$id' => $this->get_id(),
                                '$parent' => $this->get_id(),
@@ -569,7 +571,8 @@ class Item extends BaseObject {
                                '$preview' => t('Preview'),
                                '$indent' => $indent,
                                '$sourceapp' => t($a->sourcename),
-                               '$ww' => (($conv->get_mode() === 'network') ? $ww : '')
+                               '$ww' => (($conv->get_mode() === 'network') ? $ww : ''),
+                               '$rand_num' => random_digits(12)
                        ));
                }
 
@@ -660,5 +663,9 @@ class Item extends BaseObject {
        private function is_visiting() {
                return $this->visiting;
        }
+
+
+
+
 }
 ?>