X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=object%2FItem.php;h=b8afe2213a547651b49607a973ef5f542157683a;hb=c8b4ce9ccad9e710bdc40086368aba1c6ec05f6d;hp=892040dd31eeb3fc7606b2c2789086fcefa6c01e;hpb=cef516956799589c7a7a17c57e7576a87047418f;p=friendica.git

diff --git a/object/Item.php b/object/Item.php
index 892040dd31..b8afe2213a 100644
--- 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);
 
@@ -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);
         }
         
@@ -519,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 '';
 		}
 		
@@ -531,7 +535,6 @@ class Item extends BaseObject {
 			$ww = 'ww';
 
 		if($conv->is_writable() && $this->is_writable()) {
-			$a = $this->get_app();
 			$qc = $qcomment =  null;
 
 			/*
@@ -545,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(),
@@ -567,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)
 			));
 		}