Merge branch 'dev' into 'dev'

Add check if threads are enabled globally

See merge request hubzilla/core!1621
This commit is contained in:
Max Kostikov 2019-05-02 11:42:39 +02:00
commit b35961c53c

View File

@ -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();