Skip to content

Y
yii2
Commit 530d7baa by Qiang Xue
Options

fixed test break.

parent a3274c5f
Showing with 5 additions and 7 deletions
framework/base/Application.php
...@@ -207,13 +207,11 @@ abstract class Application extends Module ...@@ -207,13 +207,11 @@ 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; } elseif (is_array($config['components'][$id]) && !isset($config['components'][$id]['class'])) {
} elseif (is_array($config['components'][$id]) && !isset($config['components'][$id]['class'])) { $config['components'][$id]['class'] = $component['class'];
$config['components'][$id]['class'] = $component['class'];
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment