aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-05-02 10:48:55 +0200
committerMario <mario@mariovavti.com>2019-05-02 10:48:55 +0200
commit238b3a97a8d3ee6d536aa62563642da85b204f3c (patch)
tree9aca2ae2e0254d1d728f40af8ba4608a208c2a25
parent6672299f8ac973e92950f2134d5f7a5ec81825f3 (diff)
parentd4ab8a5a5d933e7d6e1cec610c26756e32b05624 (diff)
downloadvolse-hubzilla-238b3a97a8d3ee6d536aa62563642da85b204f3c.tar.gz
volse-hubzilla-238b3a97a8d3ee6d536aa62563642da85b204f3c.tar.bz2
volse-hubzilla-238b3a97a8d3ee6d536aa62563642da85b204f3c.zip
Merge branch 'dev' into 'dev'
Check if 'reply on comment' enabled for this profile See merge request hubzilla/core!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 7a3a7c0c5..9d15215e3 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 = feature_enabled($conv->get_profile_owner(),'reply_to');
$observer = \App::get_observer();