|
|
|
@ -253,13 +253,17 @@ abstract class Module extends Component
|
|
|
|
|
$config = $this->_moduleConfig[$id]; |
|
|
|
|
if (!isset($config['enabled']) || $config['enabled']) |
|
|
|
|
{ |
|
|
|
|
Yii::trace("Loading \"$id\" module", 'system.base.CModule'); |
|
|
|
|
\Yii::trace("Loading \"$id\" module", 'system.base.CModule'); |
|
|
|
|
$class = $config['class']; |
|
|
|
|
unset($config['class'], $config['enabled']); |
|
|
|
|
if ($this === Yii::app()) |
|
|
|
|
if ($this === \Yii::$app) |
|
|
|
|
{ |
|
|
|
|
$module = Yii::create($class, $id, null, $config); |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
{ |
|
|
|
|
$module = Yii::create($class, $this->getId() . '/' . $id, $this, $config); |
|
|
|
|
} |
|
|
|
|
return $this->_modules[$id] = $module; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -360,10 +364,9 @@ abstract class Module extends Component
|
|
|
|
|
$config = $this->_componentConfig[$id]; |
|
|
|
|
if (!isset($config['enabled']) || $config['enabled']) |
|
|
|
|
{ |
|
|
|
|
Yii::trace("Loading \"$id\" application component", 'system.CModule'); |
|
|
|
|
\Yii::trace("Loading \"$id\" application component", 'system.CModule'); |
|
|
|
|
unset($config['enabled']); |
|
|
|
|
$component = Yii::create($config); |
|
|
|
|
$component->init(); |
|
|
|
|
$component = \Yii::create($config); |
|
|
|
|
return $this->_components[$id] = $component; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|