refactored Component::off().

framework/yii/base/Component.php

@@ -406,9 +406,12 @@ class Component extends Object
 	public function off($name, $handler = null)
 	{
 		$this->ensureBehaviors();
-		if (isset($this->_events[$name])) {
+		if (empty($this->_events[$name])) {
+			return false;
+		}
 		if ($handler === null) {
-				$this->_events[$name] = [];
+			unset($this->_events[$name]);
+			return true;
 		} else {
 			$removed = false;
 			foreach ($this->_events[$name] as $i => $event) {
@@ -423,8 +426,6 @@ class Component extends Object
 			return $removed;
 		}
 	}
-		return false;
-	}
 
 	/**
 	 * Triggers an event.