Add ensureBehaviors() to detachBehavior*()

Need to add ensureBehaviors() to detachBehavior*(). The intent may be to detach behaviors defined in behaviors(). In the original implementation, if these behaviors() are not yet attached, they can not selectively be detached.

Add ensureBehaviors() to detachBehavior*()
2d1180f3 · mdeweerd · d2f35f20 · 2d1180f3
Commit 2d1180f3 authored May 06, 2013 by mdeweerd
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Component.php framework/base/Component.php +2 -0

No files found.
--- a/framework/base/Component.php
+++ b/framework/base/Component.php
@@ -496,6 +496,7 @@ class Component extends Object
 	 */
 	public function detachBehavior($name)
 	{
+		$this->ensureBehaviors();
 		if (isset($this->_behaviors[$name])) {
 			$behavior = $this->_behaviors[$name];
 			unset($this->_behaviors[$name]);
@@ -511,6 +512,7 @@ class Component extends Object
 	 */
 	public function detachBehaviors()
 	{
+		$this->ensureBehaviors();
 		if ($this->_behaviors !== null) {
 			foreach ($this->_behaviors as $name => $behavior) {
 				$this->detachBehavior($name);