gnh1201/reasonableframework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Namhyeon Go 2018-12-18 12:24:15 +09:00
parent f95edce268
commit 98516736ef
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
system/config.php
View File

@ -12,8 +12,18 @@ if(!function_exists("read_config")) {
$files = retrieve_storage_files("config"); $files = retrieve_storage_files("config");
foreach($files as $file) { foreach($files as $file) {
$ini = array();
if(check_file_extension($file, "ini.php", array("multiple" => true))) { if(check_file_extension($file, "ini.php", array("multiple" => true))) {
$ini = parse_ini_file(include($file)); $ini = parse_ini_string(include($file));
} elseif(check_file_extension($file, "config.php", array("multiple" => true))) {
$name = basename($file, ".config.php");
$ini[$name] = include($file);
} elseif(check_file_extension($file, "ini")) {
$ini = parse_ini_file($file);
}
if(count($ini) > 0) {
foreach($ini as $k=>$v) { foreach($ini as $k=>$v) {
$config[$k] = $v; $config[$k] = $v;
} }

4
system/storage.php
View File

@ -316,8 +316,8 @@ if(!function_exists("get_file_extension")) {
} }
if(!function_exists("check_file_extension")) { if(!function_exists("check_file_extension")) {
function check_file_extension($file, $extension, $options=array()) { function check_file_extension($file, $extension) {
return (get_file_extension($file, $options) === $extension); return (get_file_extension($file) === $extension);
} }
} }