Removed static variable from autoload per qiangxue's suggestion

wicaksono · May 9, 2013 · 882a611 · 882a611
1 parent bac5c0e
commit 882a611
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/framework/YiiBase.php b/framework/YiiBase.php
@@ -332,11 +332,6 @@ public static function setAlias($alias, $path)
 	 */
 	public static function autoload($className)
 	{
-		static $hasTraitFunctionality;
-		if($hasTraitFunctionality === null) {
-			$hasTraitFunctionality = function_exists('trait_exists');
-		}
-
 		$className = ltrim($className, '\\');
 
 		if (isset(self::$classMap[$className])) {
@@ -376,7 +371,7 @@ public static function autoload($className)
 		include($classFile);
 
 		if (class_exists($className, false) || interface_exists($className, false) ||
-			($hasTraitFunctionality === true && trait_exists($className, false))) {
+			function_exists('trait_exists') && trait_exists($className, false)) {
 			return true;
 		} else {
 			throw new UnknownClassException("Unable to find '$className' in file: $classFile");