--- a/web/lib/Zend/Controller/Action/Helper/ViewRenderer.php Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/Controller/Action/Helper/ViewRenderer.php Thu May 07 15:16:02 2015 +0200
@@ -15,9 +15,9 @@
* @category Zend
* @package Zend_Controller
* @subpackage Zend_Controller_Action_Helper
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: ViewRenderer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version $Id$
*/
/**
@@ -68,7 +68,7 @@
* @uses Zend_Controller_Action_Helper_Abstract
* @package Zend_Controller
* @subpackage Zend_Controller_Action_Helper
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_Helper_Abstract
@@ -842,7 +842,12 @@
$request = $this->getRequest();
$dispatcher = $this->getFrontController()->getDispatcher();
$module = $dispatcher->formatModuleName($request->getModuleName());
- $controller = $request->getControllerName();
+ $controller = $dispatcher->formatControllerName(
+ $request->getControllerName()
+ );
+ if ('Controller' == substr($controller, -10)) {
+ $controller = substr($controller, 0, -10);
+ }
$action = $dispatcher->formatActionName($request->getActionName());
$params = compact('module', 'controller', 'action');