diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:32:35 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:32:35 +0200 |
| commit | 4a7384bc0ce1893a432bf4b7d67bca23796fe9db (patch) | |
| tree | 5623c66a3f66445284529d6207e4ab4a2edb2810 /Zotlabs/Lib/System.php | |
| parent | c664a4bdcd1bd578f5ec3c2884f7c97e9f68d2d7 (diff) | |
| parent | 90bc21f2d560d879d7eaf05a85af6d6dca53ebac (diff) | |
| download | volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.tar.gz volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.tar.bz2 volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.zip | |
Merge branch '2.6RC'2.6
Diffstat (limited to 'Zotlabs/Lib/System.php')
| -rw-r--r-- | Zotlabs/Lib/System.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php index 306c90f4a..a5790fb07 100644 --- a/Zotlabs/Lib/System.php +++ b/Zotlabs/Lib/System.php @@ -19,6 +19,9 @@ class System { static public function get_project_version() { if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version']) return ''; + if(is_array(\App::$config) && is_array(\App::$config['system']) && array_key_exists('std_version',\App::$config['system'])) + return \App::$config['system']['std_version']; + return self::get_std_version(); } @@ -54,12 +57,8 @@ class System { return 'https://github.com/redmatrix/hubzilla'; } - - static public function get_server_role() { - if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['server_role']) - return \App::$config['system']['server_role']; - return 'standard'; + return 'pro'; } static public function get_std_version() { @@ -72,11 +71,8 @@ class System { if(get_directory_realm() != DIRECTORY_REALM) return true; - - foreach(['hubzilla','zap'] as $t) { - if(stristr($p,$t)) - return true; - } + if(in_array(strtolower($p),['hubzilla','zap','red'])) + return true; return false; } } |