php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-10 23:50:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed test break.

Browse Source
This commit is contained in:
Qiang Xue
2014-03-18 00:23:12 -04:00
parent a3274c5ffc
commit 530d7baabe
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/base/Application.php
View File

@@ -207,7 +207,6 @@ abstract class Application extends Module
} }
// merge core components with custom components // merge core components with custom components
if (!empty($config['components'])) {
foreach ($this->coreComponents() as $id => $component) { foreach ($this->coreComponents() as $id => $component) {
if (!isset($config['components'][$id])) { if (!isset($config['components'][$id])) {
$config['components'][$id] = $component; $config['components'][$id] = $component;
@@ -216,7 +215,6 @@ abstract class Application extends Module
} }
} }
} }
}
/** /**
* @inheritdoc * @inheritdoc