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 13:50:39 +09:00
parent 24bf827f01
commit 8f30b9dc83
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/config/sns.ini.php
View File

@ -1,3 +1,5 @@
<?php
return <<<EOF
[sns] [sns]
sns_facebook_id= sns_facebook_id=
sns_facebook_secret= sns_facebook_secret=
@ -7,3 +9,4 @@ sns_linkedin_id=
sns_linkedin_secret= sns_linkedin_secret=
sns_google_id= sns_google_id=
sns_google_secret= sns_google_secret=
EOF;

12
system/config.php
View File

@ -15,18 +15,14 @@ if(!function_exists("read_config")) {
$ini = array(); $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_string(include($file)); $str = include($file);
} elseif(check_file_extension($file, "config.php", array("multiple" => true))) { $ini = parse_ini_string($str);
$name = basename($file, ".config.php");
$ini[$name] = include($file);
} elseif(check_file_extension($file, "ini")) { } elseif(check_file_extension($file, "ini")) {
$ini = parse_ini_file($file); $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;
}
} }
} }