aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-05-02 10:58:00 +0200
committerMax Kostikov <max@kostikov.co>2019-05-02 10:58:00 +0200
commit516167c0f8579c8a068b6e52557e7e1109f897ae (patch)
treed73085bb47e31b6f74dcbfcc9200b0cd642580a6
parent238b3a97a8d3ee6d536aa62563642da85b204f3c (diff)
downloadvolse-hubzilla-516167c0f8579c8a068b6e52557e7e1109f897ae.tar.gz
volse-hubzilla-516167c0f8579c8a068b6e52557e7e1109f897ae.tar.bz2
volse-hubzilla-516167c0f8579c8a068b6e52557e7e1109f897ae.zip
Revert "Merge branch 'dev' into 'dev'"
This reverts merge request !1620
-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 9d15215e3..7a3a7c0c5 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 = feature_enabled($conv->get_profile_owner(),'reply_to');
+ $this->threaded = get_config('system','thread_allow',((defined('NOMADIC')) ? false : true));
$observer = \App::get_observer();