Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#2369 branch 'hotfix/re…
Browse files Browse the repository at this point in the history
…move-unused-vars'
  • Loading branch information
Maks3w committed Sep 15, 2012
2 parents 7e16a91 + 85785f8 commit 725a039
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Listener/ConfigListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function onLoadModulesPost(ModuleEvent $e)

// Merge all of the collected configs
$this->mergedConfig = $this->getOptions()->getExtraConfig() ?: array();
foreach ($this->configs as $key => $config) {
foreach ($this->configs as $config) {
$this->mergedConfig = ArrayUtils::merge($this->mergedConfig, $config);
}

Expand Down

0 comments on commit 725a039

Please sign in to comment.