diff options
author | Max Kostikov <max@kostikov.co> | 2019-05-02 08:33:51 +0200 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2019-05-02 08:33:51 +0200 |
commit | ea5f515f18df8821f5782af0b726866b6ddc3648 (patch) | |
tree | 6bd18dff8b72cb5470322eab0a65155021d1e0e4 /Zotlabs/Lib | |
parent | cbe35281b9964666ffef559d8fa7c9f803701f7f (diff) | |
parent | ea6293544d53848021f07074d786b064a6fa0a7e (diff) | |
download | volse-hubzilla-ea5f515f18df8821f5782af0b726866b6ddc3648.tar.gz volse-hubzilla-ea5f515f18df8821f5782af0b726866b6ddc3648.tar.bz2 volse-hubzilla-ea5f515f18df8821f5782af0b726866b6ddc3648.zip |
Merge branch 'dev' into 'dev'
Add Zap threads support
See merge request hubzilla/core!1619
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 31259f012..7a3a7c0c5 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -38,6 +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)); $observer = \App::get_observer(); |