From f284558007583c7b882071fa995f994661bb97cc Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 1 May 2016 19:29:30 -0700
Subject: use only the std_version

---
 Zotlabs/Module/Admin.php   |  2 +-
 Zotlabs/Project/System.php | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index b22931b1a..5eaede6a6 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -221,7 +221,7 @@ class Admin extends \Zotlabs\Web\Controller {
 			'$pending' => array( t('Pending registrations'), $pending),
 			'$channels' => array( t('Registered channels'), $channels),
 			'$plugins' => array( t('Active plugins'), $plugins ),
-			'$version' => array( t('Version'), RED_VERSION),
+			'$version' => array( t('Version'), STD_VERSION),
 			'$build' => get_config('system', 'db_version')
 		));
 	}
diff --git a/Zotlabs/Project/System.php b/Zotlabs/Project/System.php
index a67742db5..f61313da0 100644
--- a/Zotlabs/Project/System.php
+++ b/Zotlabs/Project/System.php
@@ -4,56 +4,51 @@ namespace Zotlabs\Project;
 
 class System {
 
-	function get_platform_name() {
+	static public function get_platform_name() {
 		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['platform_name'])
 			return \App::$config['system']['platform_name'];
 		return PLATFORM_NAME;
 	}
 
-	function get_site_name() {
+	static public function get_site_name() {
 		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['sitename'])
 			return \App::$config['system']['sitename'];
 		return '';
 	}
 
-	function get_project_version() {
+	static public function get_project_version() {
 		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version'])
 			return '';
-		return RED_VERSION;
+		return self::get_std_version();
 	}
 
-	function get_update_version() {
+	static public function get_update_version() {
 		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version'])
 			return '';
 		return DB_UPDATE_VERSION;
 	}
 
 
-	function get_notify_icon() {
+	static public function get_notify_icon() {
 		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['email_notify_icon_url'])
 			return \App::$config['system']['email_notify_icon_url'];
 		return z_root() . '/images/hz-white-32.png';
 	}
 
-	function get_site_icon() {
+	static public function get_site_icon() {
 		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['site_icon_url'])
 			return \App::$config['system']['site_icon_url'];
 		return z_root() . '/images/hz-32.png';
 	}
 
 
-	function get_server_role() {
+	static public function get_server_role() {
 		if(UNO)
 			return 'basic';
 		return 'advanced';
 	}
 
-	// return the standardised version. Since we can't easily compare
-	// before the STD_VERSION definition was applied, we have to treat 
-	// all prior release versions the same. You can dig through them
-	// with other means (such as RED_VERSION) if necessary. 
-
-	function get_std_version() {
+	static public function get_std_version() {
 		if(defined('STD_VERSION'))
 			return STD_VERSION;
 		return '0.0.0';
-- 
cgit v1.2.3