From 516167c0f8579c8a068b6e52557e7e1109f897ae Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Thu, 2 May 2019 10:58:00 +0200 Subject: Revert "Merge branch 'dev' into 'dev'" This reverts merge request !1620 --- Zotlabs/Lib/ThreadItem.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Lib') 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(); -- cgit v1.2.3