fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Automatically create old config file if it does not exist

Browse source
This commit is contained in:
Kijin Sung 2016-02-06 12:49:46 +09:00
parent 3b641c1774
commit ede85adf24
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
classes/context/Context.class.php
View file

@ -530,6 +530,11 @@ class Context
// Save old format to Context instance. // Save old format to Context instance.
self::$_instance->allow_rewrite = $config['use_rewrite']; self::$_instance->allow_rewrite = $config['use_rewrite'];
self::$_instance->db_info = $db_info; self::$_instance->db_info = $db_info;
if (!file_exists($old_config_file = self::getConfigFile()))
{
$buff = '<?php' . "\n" . '$db_info = ' . Rhymix\Framework\Config::serialize($db_info) . ';' . "\n";
FileHandler::writeFile($old_config_file, $buff);
}
} }
/** /**

4
common/framework/config.php
View file

@ -309,7 +309,7 @@ class Config
$config['lock']['message'] = strval($db_info->sitelock_message); $config['lock']['message'] = strval($db_info->sitelock_message);
if (!is_array($db_info->sitelock_whitelist)) if (!is_array($db_info->sitelock_whitelist))
{ {
$db_info->sitelock_whitelist = array_map('trim', explode(',', trim($db_info->sitelock_whitelist))); $db_info->sitelock_whitelist = $db_info->sitelock_whitelist ? array_map('trim', explode(',', trim($db_info->sitelock_whitelist))) : array();
} }
if (!in_array('127.0.0.1', $db_info->sitelock_whitelist)) if (!in_array('127.0.0.1', $db_info->sitelock_whitelist))
{ {
@ -394,7 +394,7 @@ class Config
{ {
if (is_object($value)) if (is_object($value))
{ {
return '(object)' . self::serializeValue((array)$value); return '(object)' . self::serialize((array)$value);
} }
elseif (is_array($value)) elseif (is_array($value))
{ {