|
@@ -64,9 +64,13 @@ class Zend_Application_Bootstrap_Bootstrap
|
|
|
parent::__construct($application);
|
|
parent::__construct($application);
|
|
|
|
|
|
|
|
if ($application->hasOption('resourceloader')) {
|
|
if ($application->hasOption('resourceloader')) {
|
|
|
- $this->setOptions(array(
|
|
|
|
|
- 'resourceloader' => $application->getOption('resourceloader')
|
|
|
|
|
- ));
|
|
|
|
|
|
|
+ $this->setOptions(
|
|
|
|
|
+ array(
|
|
|
|
|
+ 'resourceloader' => $application->getOption(
|
|
|
|
|
+ 'resourceloader'
|
|
|
|
|
+ )
|
|
|
|
|
+ )
|
|
|
|
|
+ );
|
|
|
}
|
|
}
|
|
|
$this->getResourceLoader();
|
|
$this->getResourceLoader();
|
|
|
|
|
|
|
@@ -128,10 +132,14 @@ class Zend_Application_Bootstrap_Bootstrap
|
|
|
) {
|
|
) {
|
|
|
$r = new ReflectionClass($this);
|
|
$r = new ReflectionClass($this);
|
|
|
$path = $r->getFileName();
|
|
$path = $r->getFileName();
|
|
|
- $this->setResourceLoader(new Zend_Application_Module_Autoloader(array(
|
|
|
|
|
- 'namespace' => $namespace,
|
|
|
|
|
- 'basePath' => dirname($path),
|
|
|
|
|
- )));
|
|
|
|
|
|
|
+ $this->setResourceLoader(
|
|
|
|
|
+ new Zend_Application_Module_Autoloader(
|
|
|
|
|
+ array(
|
|
|
|
|
+ 'namespace' => $namespace,
|
|
|
|
|
+ 'basePath' => dirname($path),
|
|
|
|
|
+ )
|
|
|
|
|
+ )
|
|
|
|
|
+ );
|
|
|
}
|
|
}
|
|
|
return $this->_resourceLoader;
|
|
return $this->_resourceLoader;
|
|
|
}
|
|
}
|