Index: Zend/Loader.php =================================================================== --- Zend/Loader.php (.../trunk/core/library) (revisione 25) +++ Zend/Loader.php (.../vendor/zf/1.5.1) (revisione 25) @@ -43,25 +43,18 @@ * If the file was not found in the $dirs, or if no $dirs were specified, * it will attempt to load it from PHP's include_path. * - * @param string $class - The full class name of a Zend component. - * @param string|array $dirs - OPTIONAL Either a path or an array of - * paths to search. - * @param boolean $useAutoload - OPTIONAL Whether to use or not an autoload - * defined function + * @param string $class - The full class name of a Zend component. + * @param string|array $dirs - OPTIONAL Either a path or an array of paths + * to search. * @return void * @throws Zend_Exception */ - public static function loadClass($class, $dirs = null, $useAutoload = true) + public static function loadClass($class, $dirs = null) { if (class_exists($class, false) || interface_exists($class, false)) { return; } - if (spl_autoload_functions() !== false and $useAutoload) { - spl_autoload_call($class); - if (class_exists($class, false) || interface_exists($class, false)) return; - } - if ((null !== $dirs) && !is_string($dirs) && !is_array($dirs)) { require_once 'Zend/Exception.php'; throw new Zend_Exception('Directory argument must be a string or an array'); @@ -185,7 +178,7 @@ public static function autoload($class) { try { - self::loadClass($class, null, false); + self::loadClass($class); return $class; } catch (Exception $e) { return false;