Merge pull request #4008 from zeroadam/Oauth-#3878

[friendica.git] / src / Object / Item.php

diff --git a/src/Object/Item.php b/src/Object/Item.php
index 2bfdc6895236e75f8a41a2e0864872bbccb1299b..1533908aeb375b6ae8e90a9dfa679fb1c67edb0f 100644 (file)
--- a/src/Object/Item.php
+++ b/src/Object/Item.php
@@ -5,6 +5,7 @@
 namespace Friendica\Object;
 
 use Friendica\BaseObject;
+use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
@@ -13,6 +14,7 @@ use dba;
 
 require_once 'include/text.php';
 require_once 'boot.php';
+require_once "include/conversation.php";
 
 /**
  * An item
@@ -66,7 +68,7 @@ class Item extends BaseObject
                $ssl_state = ((local_user()) ? true : false);
                $this->redirect_url = 'redir/' . $this->getDataValue('cid');
 
-               if (Config::get('system', 'thread_allow') && $a->theme_thread_allow && !$this->isToplevel()) {
+               if (!$this->isToplevel()) {
                        $this->threaded = true;
                }
 
@@ -160,7 +162,7 @@ class Item extends BaseObject
 
                $drop = array(
                        'dropping' => $dropping,
-                       'pagedrop' => ((feature_enabled($conv->getProfileOwner(), 'multi_delete')) ? $item['pagedrop'] : ''),
+                       'pagedrop' => ((Feature::isEnabled($conv->getProfileOwner(), 'multi_delete')) ? $item['pagedrop'] : ''),
                        'select'   => t('Select'),
                        'delete'   => t('Delete'),
                );
@@ -278,7 +280,7 @@ class Item extends BaseObject
                                }
 
                                $tagger = '';
-                               if (feature_enabled($conv->getProfileOwner(), 'commtag')) {
+                               if (Feature::isEnabled($conv->getProfileOwner(), 'commtag')) {
                                        $tagger = array(
                                                'add'   => t("add tag"),
                                                'class' => "",
@@ -292,7 +294,7 @@ class Item extends BaseObject
                if ($conv->isWritable()) {
                        $buttons = array(
                                'like' => array( t("I like this \x28toggle\x29"), t("like")),
-                               'dislike' => ((feature_enabled($conv->getProfileOwner(), 'dislike')) ? array( t("I don't like this \x28toggle\x29"), t("dislike")) : ''),
+                               'dislike' => ((Feature::isEnabled($conv->getProfileOwner(), 'dislike')) ? array( t("I don't like this \x28toggle\x29"), t("dislike")) : ''),
                        );
                        if ($shareable) {
                                $buttons['share'] = array( t('Share this'), t('share'));
@@ -377,12 +379,12 @@ class Item extends BaseObject
                        'owner_photo'     => $a->remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
                        'owner_name'      => htmlentities($owner_name_e),
                        'plink'           => get_plink($item),
-                       'edpost'          => ((feature_enabled($conv->getProfileOwner(), 'edit_posts')) ? $edpost : ''),
+                       'edpost'          => ((Feature::isEnabled($conv->getProfileOwner(), 'edit_posts')) ? $edpost : ''),
                        'isstarred'       => $isstarred,
-                       'star'            => ((feature_enabled($conv->getProfileOwner(), 'star_posts')) ? $star : ''),
-                       'ignore'          => ((feature_enabled($conv->getProfileOwner(), 'ignore_posts')) ? $ignore : ''),
+                       'star'            => ((Feature::isEnabled($conv->getProfileOwner(), 'star_posts')) ? $star : ''),
+                       'ignore'          => ((Feature::isEnabled($conv->getProfileOwner(), 'ignore_posts')) ? $ignore : ''),
                        'tagger'          => $tagger,
-                       'filer'           => ((feature_enabled($conv->getProfileOwner(), 'filing')) ? $filer : ''),
+                       'filer'           => ((Feature::isEnabled($conv->getProfileOwner(), 'filing')) ? $filer : ''),
                        'drop'            => $drop,
                        'vote'            => $buttons,
                        'like'            => $responses['like']['output'],
@@ -744,9 +746,6 @@ class Item extends BaseObject
        private function getCommentBox($indent)
        {
                $a = self::getApp();
-               if (!$this->isToplevel() && !(Config::get('system', 'thread_allow') && $a->theme_thread_allow)) {
-                       return '';
-               }
 
                $comment_box = '';
                $conv = $this->getConversation();
@@ -793,7 +792,7 @@ class Item extends BaseObject
                                '$edimg'       => t('Image'),
                                '$edurl'       => t('Link'),
                                '$edvideo'     => t('Video'),
-                               '$preview'     => ((feature_enabled($conv->getProfileOwner(), 'preview')) ? t('Preview') : ''),
+                               '$preview'     => ((Feature::isEnabled($conv->getProfileOwner(), 'preview')) ? t('Preview') : ''),
                                '$indent'      => $indent,
                                '$sourceapp'   => t($a->sourcename),
                                '$ww'          => (($conv->getMode() === 'network') ? $ww : ''),