import v2.0.0.0_RC3 | 2012-07-01
https://github.com/lucanos/CommunityID -> http://www.itadmins.net/archives/357
This commit is contained in:
@ -17,7 +17,7 @@
|
||||
* @subpackage Dispatcher
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Standard.php 16541 2009-07-07 06:59:03Z bkarwin $
|
||||
* @version $Id: Standard.php 19093 2009-11-20 14:59:00Z bate $
|
||||
*/
|
||||
|
||||
/** Zend_Loader */
|
||||
@ -260,7 +260,7 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs
|
||||
* arguments; throw exception if it's not an action controller
|
||||
*/
|
||||
$controller = new $className($request, $this->getResponse(), $this->getParams());
|
||||
if (!($controller instanceof Zend_Controller_Action_Interface) &&
|
||||
if (!($controller instanceof Zend_Controller_Action_Interface) &&
|
||||
!($controller instanceof Zend_Controller_Action)) {
|
||||
require_once 'Zend/Controller/Dispatcher/Exception.php';
|
||||
throw new Zend_Controller_Dispatcher_Exception(
|
||||
@ -335,7 +335,9 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs
|
||||
$dispatchDir = $this->getDispatchDirectory();
|
||||
$loadFile = $dispatchDir . DIRECTORY_SEPARATOR . $this->classToFilename($className);
|
||||
|
||||
if (!include_once $loadFile) {
|
||||
if (file_exists($loadFile)) {
|
||||
include_once $loadFile;
|
||||
} else {
|
||||
require_once 'Zend/Controller/Dispatcher/Exception.php';
|
||||
throw new Zend_Controller_Dispatcher_Exception('Cannot load controller class "' . $className . '" from file "' . $loadFile . "'");
|
||||
}
|
||||
|
Reference in New Issue
Block a user