Skip to content

Commit

Permalink
Always reset mergedConfigObject when setMergedConfig is called on the…
Browse files Browse the repository at this point in the history
… module manager.

See comments on zendframework#572 for more details.
  • Loading branch information
EvanDotPro committed Nov 11, 2011
1 parent 595c54b commit 9d13ed4
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions library/Zend/Module/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,7 @@ public function getMergedConfig($returnConfigAsObject = true)
public function setMergedConfig(array $config)
{
$this->mergedConfig = $config;
if ($this->mergedConfigObject !== null) {
$this->mergedConfigObject = new Config($this->mergedConfig);
}
$this->mergedConfigObject = null; // will generate Config instance on-demand if required
return $this;
}

Expand Down

0 comments on commit 9d13ed4

Please sign in to comment.