]> git.mxchange.org Git - friendica.git/commitdiff
Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd
authorDomovoy <domovoy@errlock.org>
Mon, 10 Sep 2012 07:50:30 +0000 (09:50 +0200)
committerDomovoy <domovoy@errlock.org>
Mon, 10 Sep 2012 07:50:30 +0000 (09:50 +0200)
include/conversation.php
object/Conversation.php
object/Item.php

index 663611369de5bc8f91d33567e4024028a028119f..930cd646c538dc3ad70b31fc0e013ec0a9157c1b 100644 (file)
@@ -909,7 +909,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
             require_once('object/Conversation.php');
             require_once('object/Item.php');
 
-            $conv = new Conversation($mode);
+            $conv = new Conversation($mode, $preview);
 
             // get all the topmost parents
             // this shouldn't be needed, as we should have only them in our array
index f4f9c09720d43fa1f4ed78cef331d6817493a969..2b65ba468113c3c9778a43b631441d28768afc1e 100644 (file)
@@ -17,9 +17,11 @@ class Conversation extends BaseObject {
        private $mode = null;
        private $writable = false;
        private $profile_owner = 0;
+       private $preview = false;
 
-       public function __construct($mode) {
+       public function __construct($mode, $preview) {
                $this->set_mode($mode);
+               $this->preview = $preview;
        }
 
        /**
@@ -67,6 +69,13 @@ class Conversation extends BaseObject {
                return $this->writable;
        }
 
+       /**
+        * Check if page is a preview
+        */
+       public function is_preview() {
+               return $this->preview;
+       }
+
        /**
         * Get profile owner
         */
index c7b40070d92cffc78e00f48e47a01b63b1d6db4e..51ad6562d17edbd6abab845ad78f4c49390ba2a1 100644 (file)
@@ -222,7 +222,7 @@ class Item extends BaseObject {
                        'like' => $like,
                        'dislike' => $dislike,
                        'comment' => $this->get_comment_box($indent),
-                       'previewing' => $previewing,
+                       'previewing' => ($conv->is_preview() ? ' preview ' : ''),
                        'wait' => t('Please wait'),
                        'thread_level' => $thread_level
                );