BUG 8875 "Feature: New ExtJS based Login & Main ProcessMaker inte..." SOLVED

- windows on php ver. > 5.3.8 compatibility added
This commit is contained in:
Erik Amaru Ortiz
2012-04-11 11:16:04 -04:00
parent 943a2a7d98
commit bc79391223
3 changed files with 14 additions and 19 deletions

View File

@@ -1008,7 +1008,7 @@ class System {
return $cities;
}
public function getSystemConfiguration($iniFile='')
public static function getSystemConfiguration($iniFile='')
{
$config = array(
'debug' => 0,
@@ -1030,11 +1030,14 @@ class System {
/* Read the env.ini */
$ini_contents = parse_ini_file($iniFile, false);
// validation debug config, ony accept bynary values, 1 to enable
$ini_contents['debug'] = $ini_contents['debug'] == 1 ? 1 : 0;
if ($ini_contents !== false) {
$config = array_merge($config, $ini_contents);
}
//echo '<pre>'; print_r($config); die;
return $config;
}