diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-13 20:18:19 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-13 20:18:19 -0700 |
| commit | 2d119c81a44691773bacd9e545ce49bebd522098 (patch) | |
| tree | c4f0ccce9224f2952f308bc60917438423d2138e | |
| parent | 88bb61018da11207293a2bcbfaef7ce99623e0ba (diff) | |
| download | volse-hubzilla-2d119c81a44691773bacd9e545ce49bebd522098.tar.gz volse-hubzilla-2d119c81a44691773bacd9e545ce49bebd522098.tar.bz2 volse-hubzilla-2d119c81a44691773bacd9e545ce49bebd522098.zip | |
turn platform name and std_version into config variables
| -rw-r--r-- | Zotlabs/Lib/DB_Upgrade.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Lib/System.php | 3 | ||||
| -rwxr-xr-x | include/dba/dba_driver.php | 5 |
3 files changed, 11 insertions, 5 deletions
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(); } diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index 4079bcaba..7e925a106 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -163,8 +163,9 @@ abstract class dba_driver { } function get_install_script() { - if(file_exists('install/' . PLATFORM_NAME . '/' . \DBA::$install_script)) - return 'install/' . PLATFORM_NAME . '/' . \DBA::$install_script; + $platform_name = \Zotlabs\Lib\System::get_platform_name(); + if(file_exists('install/' . $platform_name . '/' . \DBA::$install_script)) + return 'install/' . $platform_name . '/' . \DBA::$install_script; return 'install/' . \DBA::$install_script; } |