Merge branch 'hotfix/resourceConfig'

This commit is contained in:
Alex Bilbie 2012-12-12 11:43:11 +00:00
commit a948335e45

View File

@ -75,7 +75,7 @@ class Server
public function __construct($options = null) public function __construct($options = null)
{ {
if ($options !== null) { if ($options !== null) {
$this->config = array_merge($this->config, $options); $this->_config = array_merge($this->_config, $options);
} }
} }