aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-08-07 17:29:35 -0700
committerredmatrix <git@macgirvin.com>2016-08-07 17:29:35 -0700
commit5243dd153bed7fe79188478922a58e8057be3f3e (patch)
tree92ca6142a60f235cf70c4a31cda0b7ffc6d68c86 /Zotlabs/Lib
parente1659b0725c275c2ba5f38a02a0f3fbcec145519 (diff)
downloadvolse-hubzilla-5243dd153bed7fe79188478922a58e8057be3f3e.tar.gz
volse-hubzilla-5243dd153bed7fe79188478922a58e8057be3f3e.tar.bz2
volse-hubzilla-5243dd153bed7fe79188478922a58e8057be3f3e.zip
use config system.server_role and deprecate 'UNO'
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/System.php4
-rw-r--r--Zotlabs/Lib/ThreadItem.php3
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;
}
}