Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Final touch

  • Loading branch information...
commit 12ed27217af49a670f65103fb9de928ca82d0d7a 1 parent 98855fa
Alexander Kochetov creocoder authored
Showing with 8 additions and 9 deletions.
  1. +8 −9 framework/base/CModule.php
17 framework/base/CModule.php
View
@@ -466,7 +466,8 @@ public function setComponents($components,$merge=true)
$this->setComponent($id,$config);
continue;
}
- elseif(isset($this->_components[$id]))
+
+ if(isset($this->_components[$id]))
{
if(isset($config['class']))
{
@@ -476,16 +477,14 @@ public function setComponents($components,$merge=true)
$this->_componentConfig[$id]=$config; //we should ignore merge here
continue;
}
- else
- {
- $class=$config['class'];
- unset($config['class']);
- foreach($config as $key=>$value)
- $this->_components[$id]->$key=$value;
+ $class=$config['class'];
+ unset($config['class']);
- $config['class']=$class;
- }
+ foreach($config as $key=>$value)
+ $this->_components[$id]->$key=$value;
+
+ $config['class']=$class;
}
else
{
Please sign in to comment.
Something went wrong with that request. Please try again.