Diabook pink

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index 134dbd643b18e8ca1b91b2a1410bac6282f44cdf..2799291111d7aeca659c0c28f32878a2692442e7 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -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);
 
@@ -227,6 +229,7 @@ class Item extends BaseObject {
                        'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
                        'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
                        'to' => t('to'),
+                       'via' => t('via'),
                        'wall' => t('Wall-to-Wall'),
                        'vwall' => t('via Wall-To-Wall:'),
                        'profile_url' => $profile_link,
@@ -241,6 +244,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()),
@@ -253,6 +257,7 @@ class Item extends BaseObject {
                        'vote' => $buttons,
                        'like' => $like,
                        'dislike' => $dislike,
+                       'switchcomment' => t('Comment'),
                        'comment' => $this->get_comment_box($indent),
                        'previewing' => ($conv->is_preview() ? ' preview ' : ''),
                        'wait' => t('Please wait'),
@@ -519,7 +524,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 '';
                }
                
@@ -531,7 +537,6 @@ class Item extends BaseObject {
                        $ww = 'ww';
 
                if($conv->is_writable() && $this->is_writable()) {
-                       $a = $this->get_app();
                        $qc = $qcomment =  null;
 
                        /*
@@ -545,7 +550,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(),
@@ -567,7 +573,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)
                        ));
                }