import v1.1.0_beta1 | 2009-08-21
This commit is contained in:
@ -25,9 +25,6 @@ require_once 'Zend/Loader.php';
|
||||
/** Zend_Controller_Action_HelperBroker */
|
||||
require_once 'Zend/Controller/Action/HelperBroker.php';
|
||||
|
||||
/** Zend_Controller_Exception */
|
||||
require_once 'Zend/Controller/Exception.php';
|
||||
|
||||
/** Zend_Controller_Plugin_Broker */
|
||||
require_once 'Zend/Controller/Plugin/Broker.php';
|
||||
|
||||
@ -135,8 +132,8 @@ class Zend_Controller_Front
|
||||
}
|
||||
|
||||
/**
|
||||
* Enforce singleton; disallow cloning
|
||||
*
|
||||
* Enforce singleton; disallow cloning
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
private function __clone()
|
||||
@ -265,9 +262,9 @@ class Zend_Controller_Front
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a controller directory by module name
|
||||
*
|
||||
* @param string $module
|
||||
* Remove a controller directory by module name
|
||||
*
|
||||
* @param string $module
|
||||
* @return bool
|
||||
*/
|
||||
public function removeControllerDirectory($module)
|
||||
@ -290,6 +287,7 @@ class Zend_Controller_Front
|
||||
try{
|
||||
$dir = new DirectoryIterator($path);
|
||||
}catch(Exception $e){
|
||||
require_once 'Zend/Controller/Exception.php';
|
||||
throw new Zend_Controller_Exception("Directory $path not readable");
|
||||
}
|
||||
foreach ($dir as $file) {
|
||||
@ -313,8 +311,8 @@ class Zend_Controller_Front
|
||||
|
||||
/**
|
||||
* Return the path to a module directory (but not the controllers directory within)
|
||||
*
|
||||
* @param string $module
|
||||
*
|
||||
* @param string $module
|
||||
* @return string|null
|
||||
*/
|
||||
public function getModuleDirectory($module = null)
|
||||
@ -444,10 +442,14 @@ class Zend_Controller_Front
|
||||
public function setRequest($request)
|
||||
{
|
||||
if (is_string($request)) {
|
||||
Zend_Loader::loadClass($request);
|
||||
if (!class_exists($request)) {
|
||||
require_once 'Zend/Loader.php';
|
||||
Zend_Loader::loadClass($request);
|
||||
}
|
||||
$request = new $request();
|
||||
}
|
||||
if (!$request instanceof Zend_Controller_Request_Abstract) {
|
||||
require_once 'Zend/Controller/Exception.php';
|
||||
throw new Zend_Controller_Exception('Invalid request class');
|
||||
}
|
||||
|
||||
@ -482,11 +484,15 @@ class Zend_Controller_Front
|
||||
public function setRouter($router)
|
||||
{
|
||||
if (is_string($router)) {
|
||||
Zend_Loader::loadClass($router);
|
||||
if (!class_exists($router)) {
|
||||
require_once 'Zend/Loader.php';
|
||||
Zend_Loader::loadClass($router);
|
||||
}
|
||||
$router = new $router();
|
||||
}
|
||||
|
||||
if (!$router instanceof Zend_Controller_Router_Interface) {
|
||||
require_once 'Zend/Controller/Exception.php';
|
||||
throw new Zend_Controller_Exception('Invalid router class');
|
||||
}
|
||||
|
||||
@ -536,6 +542,7 @@ class Zend_Controller_Front
|
||||
public function setBaseUrl($base = null)
|
||||
{
|
||||
if (!is_string($base) && (null !== $base)) {
|
||||
require_once 'Zend/Controller/Exception.php';
|
||||
throw new Zend_Controller_Exception('Rewrite base must be a string');
|
||||
}
|
||||
|
||||
@ -609,10 +616,14 @@ class Zend_Controller_Front
|
||||
public function setResponse($response)
|
||||
{
|
||||
if (is_string($response)) {
|
||||
Zend_Loader::loadClass($response);
|
||||
if (!class_exists($response)) {
|
||||
require_once 'Zend/Loader.php';
|
||||
Zend_Loader::loadClass($response);
|
||||
}
|
||||
$response = new $response();
|
||||
}
|
||||
if (!$response instanceof Zend_Controller_Response_Abstract) {
|
||||
require_once 'Zend/Controller/Exception.php';
|
||||
throw new Zend_Controller_Exception('Invalid response class');
|
||||
}
|
||||
|
||||
@ -775,8 +786,8 @@ class Zend_Controller_Front
|
||||
* Default behaviour is to trap them in the response object; call this
|
||||
* method to have them thrown.
|
||||
*
|
||||
* Passing no value will return the current value of the flag; passing a
|
||||
* boolean true or false value will set the flag and return the current
|
||||
* Passing no value will return the current value of the flag; passing a
|
||||
* boolean true or false value will set the flag and return the current
|
||||
* object instance.
|
||||
*
|
||||
* @param boolean $flag Defaults to null (return flag state)
|
||||
|
Reference in New Issue
Block a user