From 2d119c81a44691773bacd9e545ce49bebd522098 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 13 Jul 2017 20:18:19 -0700 Subject: turn platform name and std_version into config variables --- Zotlabs/Lib/DB_Upgrade.php | 8 +++++--- Zotlabs/Lib/System.php | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'Zotlabs/Lib') diff --git a/Zotlabs/Lib/DB_Upgrade.php b/Zotlabs/Lib/DB_Upgrade.php index bb72e7a05..8f0488f6f 100644 --- a/Zotlabs/Lib/DB_Upgrade.php +++ b/Zotlabs/Lib/DB_Upgrade.php @@ -10,15 +10,17 @@ class DB_Upgrade { function __construct($db_revision) { - $update_file = 'install/' . PLATFORM_NAME . '/update.php'; + $platform_name = System::get_platform_name(); + + $update_file = 'install/' . $platform_name . '/update.php'; if(! file_exists($update_file)) { $update_file = 'install/update.php'; $this->config_name = 'db_version'; $this->func_prefix = 'update_r'; } else { - $this->config_name = PLATFORM_NAME . '_db_version'; - $this->func_prefix = PLATFORM_NAME . '_update_'; + $this->config_name = $platform_name . '_db_version'; + $this->func_prefix = $platform_name . '_update_'; } $build = get_config('system', $this->config_name, 0); diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php index 3d5b18506..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(); } -- cgit v1.2.3