Browse Source

Merge branch 'master'

tags/2.0.0-beta
Alexander Makarov 11 years ago
parent
commit
61352a440f
  1. 5
      framework/yii/base/Module.php

5
framework/yii/base/Module.php

@ -539,16 +539,11 @@ abstract class Module extends Component
public function setComponents($components)
{
foreach ($components as $id => $component) {
if (isset($this->_components[$id]) && !($this->_components[$id] instanceof Object)) {
if (isset($this->_components[$id]['class']) && !isset($component['class'])) {
$component['class'] = $this->_components[$id]['class'];
}
$this->_components[$id] = $component;
}
else {
throw new Exception('Cannot set component "'.$id.'" that is already instantiated.');
}
}
}
/**

Loading…
Cancel
Save