Browse Source

Merge pull request #1703 from crtlib/patch-2

Removed redundant code in detachBehaviors()
tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
bf73fe80d4
  1. 3
      framework/yii/base/Component.php

3
framework/yii/base/Component.php

@ -543,13 +543,10 @@ class Component extends Object
public function detachBehaviors() public function detachBehaviors()
{ {
$this->ensureBehaviors(); $this->ensureBehaviors();
if ($this->_behaviors !== null) {
foreach ($this->_behaviors as $name => $behavior) { foreach ($this->_behaviors as $name => $behavior) {
$this->detachBehavior($name); $this->detachBehavior($name);
} }
} }
$this->_behaviors = [];
}
/** /**
* Makes sure that the behaviors declared in [[behaviors()]] are attached to this component. * Makes sure that the behaviors declared in [[behaviors()]] are attached to this component.

Loading…
Cancel
Save