Merge remote-tracking branch 'upstream/master'

[friendica.git] / object / Item.php

diff --git a/object/Item.php b/object/Item.php
index 134dbd643b18e8ca1b91b2a1410bac6282f44cdf..9ec63b4f20c3b16ac65d6d0c547be33588c2b8f0 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -519,7 +519,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 +532,6 @@ class Item extends BaseObject {
                        $ww = 'ww';
 
                if($conv->is_writable() && $this->is_writable()) {
-                       $a = $this->get_app();
                        $qc = $qcomment =  null;
 
                        /*
@@ -545,7 +545,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 +568,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)
                        ));
                }