aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-05-02 11:42:39 +0200
committerMax Kostikov <max@kostikov.co>2019-05-02 11:42:39 +0200
commitb35961c53cde75b133411882e35c76ef4ffd35f3 (patch)
treebef05781eacc6dbc67d03899e0dde0257ce58096 /Zotlabs
parent516167c0f8579c8a068b6e52557e7e1109f897ae (diff)
parent47fba5827bd106f53625b543f30643ca5ba1c16e (diff)
downloadvolse-hubzilla-b35961c53cde75b133411882e35c76ef4ffd35f3.tar.gz
volse-hubzilla-b35961c53cde75b133411882e35c76ef4ffd35f3.tar.bz2
volse-hubzilla-b35961c53cde75b133411882e35c76ef4ffd35f3.zip
Merge branch 'dev' into 'dev'
Add check if threads are enabled globally See merge request hubzilla/core!1621
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/ThreadItem.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 7a3a7c0c5..3f1888d30 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -38,7 +38,7 @@ class ThreadItem {
$this->data = $data;
$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
- $this->threaded = get_config('system','thread_allow',((defined('NOMADIC')) ? false : true));
+ $this->threaded = get_config('system','thread_allow');
$observer = \App::get_observer();