Commit 882a6116 by Suralc

Removed static variable from autoload per qiangxue's suggestion

parent bac5c0e7
...@@ -332,11 +332,6 @@ class YiiBase ...@@ -332,11 +332,6 @@ class YiiBase
*/ */
public static function autoload($className) public static function autoload($className)
{ {
static $hasTraitFunctionality;
if($hasTraitFunctionality === null) {
$hasTraitFunctionality = function_exists('trait_exists');
}
$className = ltrim($className, '\\'); $className = ltrim($className, '\\');
if (isset(self::$classMap[$className])) { if (isset(self::$classMap[$className])) {
...@@ -376,7 +371,7 @@ class YiiBase ...@@ -376,7 +371,7 @@ class YiiBase
include($classFile); include($classFile);
if (class_exists($className, false) || interface_exists($className, false) || 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; return true;
} else { } else {
throw new UnknownClassException("Unable to find '$className' in file: $classFile"); throw new UnknownClassException("Unable to find '$className' in file: $classFile");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment