Sync objects with upstream

diff --git a/object/Item.php b/object/Item.php
index ce4caa9cb35b3d430b7238d8f59b72dd9adc1b0c..be959dcb38720cfe8c4199ce30f6bdb2f6180e28 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -27,6 +27,7 @@ class Item extends BaseObject {
        private $owner_photo = '';
        private $owner_name = '';
        private $wall_to_wall = false;
+       private $threaded = false;
 
        public function __construct($data) {
                $a = $this->get_app();
@@ -39,6 +40,9 @@ class Item extends BaseObject {
                $ssl_state = ((local_user()) ? true : false);
                $this->redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $this->get_data_value('cid') ;
 
+               if(get_config('system','thread_allow') && $a->theme_thread_allow)
+                       $this->threaded = true;
+
                // Prepare the children
                if(count($data['children'])) {
                        foreach($data['children'] as $item) {
@@ -200,6 +204,7 @@ class Item extends BaseObject {
                        'osparkle' => $osparkle,
                        'sparkle' => $sparkle,
                        'title' => template_escape($item['title']),
+                       'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
                        'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
                        'lock' => $lock,
                        'location' => template_escape($location),
@@ -251,7 +256,7 @@ class Item extends BaseObject {
                $result['private'] = $item['private'];
                $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
 
-               if(get_config('system','thread_allow') && $a->theme_thread_allow) {
+               if($this->is_threaded()) {
                        $result['flatten'] = false;
                        $result['threaded'] = true;
                }
@@ -267,6 +272,10 @@ class Item extends BaseObject {
                return $this->get_data_value('id');
        }
 
+       public function is_threaded() {
+               return $this->threaded;
+       }
+
        /**
         * Add a child item
         */
@@ -490,7 +499,8 @@ class Item extends BaseObject {
                                $qcomment = (($qc) ? explode("\n",$qc) : null);
                        }
                        $comment_box = replace_macros($template,array(
-                               '$return_path' => '', 
+                               '$return_path' => '',
+                               '$threaded' => $this->is_threaded(),
                                '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
                                '$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'),
                                '$id' => $this->get_id(),

diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
index f64f2e44a0ffe6f9072edfa2fd248e1882efad0f..373f01ec8226ab23890e4178b935e878dc58d442 100644 (file)
--- a/view/wall_thread.tpl
+++ b/view/wall_thread.tpl
@@ -93,10 +93,12 @@
        {{ inc $item.template }}{{ endinc }}
 {{ endfor }}
 
+{{ if $item.comment }}
 {{ if $item.flatten }}
 <div class="wall-item-comment-wrapper" >
        $item.comment
 </div>
 {{ endif }}
+{{ endif }}
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{endif}}