From 846f17017cbbe272fd14aef9fdf7a05ae016e7b9 Mon Sep 17 00:00:00 2001
From: crtlib <crtlib@gmail.com>
Date: Sat, 3 Aug 2013 23:10:43 +0200
Subject: [PATCH] Component::hasProperty() small optimization

---
 framework/yii/base/Component.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/yii/base/Component.php b/framework/yii/base/Component.php
index ffab16f..f123148 100644
--- a/framework/yii/base/Component.php
+++ b/framework/yii/base/Component.php
@@ -221,18 +221,18 @@ class Component extends Object
 	 * - the class has a getter or setter method associated with the specified name
 	 *   (in this case, property name is case-insensitive);
 	 * - the class has a member variable with the specified name (when `$checkVar` is true);
-	 * - an attached behavior has a property of the given name (when `$checkBehavior` is true).
+	 * - an attached behavior has a property of the given name (when `$checkBehaviors` is true).
 	 *
 	 * @param string $name the property name
 	 * @param boolean $checkVar whether to treat member variables as properties
-	 * @param boolean $checkBehavior whether to treat behaviors' properties as properties of this component
+	 * @param boolean $checkBehaviors whether to treat behaviors' properties as properties of this component
 	 * @return boolean whether the property is defined
 	 * @see canGetProperty
 	 * @see canSetProperty
 	 */
-	public function hasProperty($name, $checkVar = true, $checkBehavior = true)
+	public function hasProperty($name, $checkVar = true, $checkBehaviors = true)
 	{
-		return $this->canGetProperty($name, $checkVar, $checkBehavior) || $this->canSetProperty($name, $checkVar, $checkBehavior);
+		return $this->canGetProperty($name, $checkVar, $checkBehaviors) || $this->canSetProperty($name, false, $checkBehavior);
 	}
 
 	/**
@@ -242,7 +242,7 @@ class Component extends Object
 	 * - the class has a getter method associated with the specified name
 	 *   (in this case, property name is case-insensitive);
 	 * - the class has a member variable with the specified name (when `$checkVar` is true);
-	 * - an attached behavior has a readable property of the given name (when `$checkBehavior` is true).
+	 * - an attached behavior has a readable property of the given name (when `$checkBehaviors` is true).
 	 *
 	 * @param string $name the property name
 	 * @param boolean $checkVar whether to treat member variables as properties
@@ -272,7 +272,7 @@ class Component extends Object
 	 * - the class has a setter method associated with the specified name
 	 *   (in this case, property name is case-insensitive);
 	 * - the class has a member variable with the specified name (when `$checkVar` is true);
-	 * - an attached behavior has a writable property of the given name (when `$checkBehavior` is true).
+	 * - an attached behavior has a writable property of the given name (when `$checkBehaviors` is true).
 	 *
 	 * @param string $name the property name
 	 * @param boolean $checkVar whether to treat member variables as properties