Skip to content
This repository
Browse code

Final touch

  • Loading branch information...
commit 12ed27217af49a670f65103fb9de928ca82d0d7a 1 parent 98855fa
Alexander Kochetov creocoder authored

Showing 1 changed file with 8 additions and 9 deletions. Show diff stats Hide diff stats

  1. +8 9 framework/base/CModule.php
17 framework/base/CModule.php
@@ -466,7 +466,8 @@ public function setComponents($components,$merge=true)
466 466 $this->setComponent($id,$config);
467 467 continue;
468 468 }
469   - elseif(isset($this->_components[$id]))
  469 +
  470 + if(isset($this->_components[$id]))
470 471 {
471 472 if(isset($config['class']))
472 473 {
@@ -476,16 +477,14 @@ public function setComponents($components,$merge=true)
476 477 $this->_componentConfig[$id]=$config; //we should ignore merge here
477 478 continue;
478 479 }
479   - else
480   - {
481   - $class=$config['class'];
482   - unset($config['class']);
483 480
484   - foreach($config as $key=>$value)
485   - $this->_components[$id]->$key=$value;
  481 + $class=$config['class'];
  482 + unset($config['class']);
486 483
487   - $config['class']=$class;
488   - }
  484 + foreach($config as $key=>$value)
  485 + $this->_components[$id]->$key=$value;
  486 +
  487 + $config['class']=$class;
489 488 }
490 489 else
491 490 {

0 comments on commit 12ed272

Please sign in to comment.
Something went wrong with that request. Please try again.