Merge code from github.com to bitbucket.org 2014-06-20 12:20

This commit is contained in:
Julio Cesar Laura
2014-06-20 12:23:47 -04:00
7 changed files with 49 additions and 20 deletions

View File

@@ -1107,8 +1107,10 @@ class System
}
// Workspace environment configuration
if (($wsConf = @parse_ini_file($wsIniFile)) !== false) {
$config = array_merge($config, $wsConf);
if (file_exists($wsIniFile) ) {
if (($wsConf = @parse_ini_file($wsIniFile)) !== false) {
$config = array_merge($config, $wsConf);
}
}
// validation debug config, only binary value is valid; debug = 1, to enable