sync master

This commit is contained in:
Ad Schellevis 2015-03-15 19:13:38 +00:00
parent 827daf7c27
commit 308122b355

View File

@ -236,12 +236,17 @@ class Config extends Singleton
set_error_handler(
function() {
throw new ConfigException("invalid config xml") ;
// reset simplexml pointer on parse error.
$this->simplexml = null ;
}
);
$this->simplexml = simplexml_load_string($xml);
if ($this->simplexml == null) {
throw new ConfigException("invalid config xml") ;
}
restore_error_handler();
$this->statusIsValid = true;
}