harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

turn platform name and std_version into config variables

Browse Source
This commit is contained in:
zotlabs 2017-07-13 20:18:19 -07:00
parent 88bb61018d
commit 2d119c81a4
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Lib/DB_Upgrade.php
View File

@ -10,15 +10,17 @@ class DB_Upgrade {
function __construct($db_revision) { 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)) { if(! file_exists($update_file)) {
$update_file = 'install/update.php'; $update_file = 'install/update.php';
$this->config_name = 'db_version'; $this->config_name = 'db_version';
$this->func_prefix = 'update_r'; $this->func_prefix = 'update_r';
} }
else { else {
$this->config_name = PLATFORM_NAME . '_db_version'; $this->config_name = $platform_name . '_db_version';
$this->func_prefix = PLATFORM_NAME . '_update_'; $this->func_prefix = $platform_name . '_update_';
} }
$build = get_config('system', $this->config_name, 0); $build = get_config('system', $this->config_name, 0);

3
Zotlabs/Lib/System.php
View File

@ -19,6 +19,9 @@ class System {
static public 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']) if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version'])
return ''; 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(); return self::get_std_version();
} }

5
include/dba/dba_driver.php
View File

@ -163,8 +163,9 @@ abstract class dba_driver {
} }
function get_install_script() { function get_install_script() {
if(file_exists('install/' . PLATFORM_NAME . '/' . \DBA::$install_script)) $platform_name = \Zotlabs\Lib\System::get_platform_name();
return 'install/' . PLATFORM_NAME . '/' . \DBA::$install_script; if(file_exists('install/' . $platform_name . '/' . \DBA::$install_script))
return 'install/' . $platform_name . '/' . \DBA::$install_script;
return 'install/' . \DBA::$install_script; return 'install/' . \DBA::$install_script;
} }