import v1.1.0_RC2 | 2009-09-20
This commit is contained in:
@ -15,8 +15,8 @@
|
||||
* @category Zend
|
||||
* @package Zend_Loader
|
||||
* @subpackage Autoloader
|
||||
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @version $Id: Interface.php 13809 2009-01-27 19:01:54Z matthew $
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @version $Id: Interface.php 16541 2009-07-07 06:59:03Z bkarwin $
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
*/
|
||||
|
||||
@ -25,8 +25,8 @@
|
||||
*
|
||||
* @package Zend_Loader
|
||||
* @subpackage Autoloader
|
||||
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license New BSD {@link http://framework.zend.com/license/new-bsd}
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
*/
|
||||
interface Zend_Loader_Autoloader_Interface
|
||||
{
|
||||
|
@ -15,8 +15,8 @@
|
||||
* @category Zend
|
||||
* @package Zend_Loader
|
||||
* @subpackage Autoloader
|
||||
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @version $Id: Resource.php 14026 2009-02-09 19:03:22Z matthew $
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @version $Id: Resource.php 17417 2009-08-06 18:06:04Z matthew $
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
*/
|
||||
|
||||
@ -29,8 +29,8 @@ require_once 'Zend/Loader/Autoloader/Interface.php';
|
||||
* @uses Zend_Loader_Autoloader_Interface
|
||||
* @package Zend_Loader
|
||||
* @subpackage Autoloader
|
||||
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license New BSD {@link http://framework.zend.com/license/new-bsd}
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
*/
|
||||
class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interface
|
||||
{
|
||||
@ -85,6 +85,9 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac
|
||||
throw new Zend_Loader_Exception('Resource loader requires both a namespace and a base path for initialization');
|
||||
}
|
||||
|
||||
if (!empty($namespace)) {
|
||||
$namespace .= '_';
|
||||
}
|
||||
Zend_Loader_Autoloader::getInstance()->unshiftAutoloader($this, $namespace);
|
||||
}
|
||||
|
||||
@ -142,7 +145,7 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac
|
||||
|
||||
if (!empty($namespaceTopLevel)) {
|
||||
$namespace = array_shift($segments);
|
||||
if ($namespace != $this->getNamespace()) {
|
||||
if ($namespace != $namespaceTopLevel) {
|
||||
// wrong prefix? we're done
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user