diff options
| author | zottel <github@zottel.net> | 2016-08-10 13:49:48 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-08-10 13:49:48 +0200 |
| commit | 8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb (patch) | |
| tree | 499ab4cac571c35f6d0758f157ed85af46c8b57c /Zotlabs/Lib | |
| parent | 6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e (diff) | |
| parent | 7a557d31e026705fc3bd2d4f39c4c679449cef56 (diff) | |
| download | volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.tar.gz volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.tar.bz2 volse-hubzilla-8706cbe1c413ed8fcfb7dcb35c7b319d2d1116bb.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/System.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php index c52a90338..4479bf597 100644 --- a/Zotlabs/Lib/System.php +++ b/Zotlabs/Lib/System.php @@ -43,8 +43,8 @@ class System { static public function get_server_role() { - if(UNO) - return 'basic'; + if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['server_role']) + return \App::$config['system']['server_role']; return 'pro'; } diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 638afeb6b..eee3b2a4f 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -245,10 +245,11 @@ class ThreadItem { ); } + $server_role = get_config('system','server_role'); $has_bookmarks = false; if(is_array($item['term'])) { foreach($item['term'] as $t) { - if(!UNO && $t['ttype'] == TERM_BOOKMARK) + if(($server_role != 'basic') && ($t['ttype'] == TERM_BOOKMARK)) $has_bookmarks = true; } } |