If $options is not equal to null then overwrite default options

This commit is contained in:
Alex Bilbie 2012-07-06 18:15:03 +01:00
parent f7d200faec
commit a823096b44

View File

@ -41,6 +41,9 @@ class Server
public function __construct(array $options) public function __construct(array $options)
{ {
$this->options = array_merge($this->config, $options); $this->options = array_merge($this->config, $options);
if ($options !== null) {
$this->options = array_merge($this->config, $options);
}
} }
public function registerDbAbstractor(object $db) public function registerDbAbstractor(object $db)