equal
deleted
inserted
replaced
13 * to license@zend.com so we can send you a copy immediately. |
13 * to license@zend.com so we can send you a copy immediately. |
14 * |
14 * |
15 * @category Zend |
15 * @category Zend |
16 * @package Zend_Controller |
16 * @package Zend_Controller |
17 * @subpackage Zend_Controller_Action_Helper |
17 * @subpackage Zend_Controller_Action_Helper |
18 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) |
18 * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) |
19 * @license http://framework.zend.com/license/new-bsd New BSD License |
19 * @license http://framework.zend.com/license/new-bsd New BSD License |
20 * @version $Id: ViewRenderer.php 20261 2010-01-13 18:55:25Z matthew $ |
20 * @version $Id: ViewRenderer.php 24593 2012-01-05 20:35:02Z matthew $ |
21 */ |
21 */ |
22 |
22 |
23 /** |
23 /** |
24 * @see Zend_Controller_Action_Helper_Abstract |
24 * @see Zend_Controller_Action_Helper_Abstract |
25 */ |
25 */ |
66 * </code> |
66 * </code> |
67 * |
67 * |
68 * @uses Zend_Controller_Action_Helper_Abstract |
68 * @uses Zend_Controller_Action_Helper_Abstract |
69 * @package Zend_Controller |
69 * @package Zend_Controller |
70 * @subpackage Zend_Controller_Action_Helper |
70 * @subpackage Zend_Controller_Action_Helper |
71 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) |
71 * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) |
72 * @license http://framework.zend.com/license/new-bsd New BSD License |
72 * @license http://framework.zend.com/license/new-bsd New BSD License |
73 */ |
73 */ |
74 class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_Helper_Abstract |
74 class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_Helper_Abstract |
75 { |
75 { |
76 /** |
76 /** |
624 } |
624 } |
625 $vars['action'] = $action; |
625 $vars['action'] = $action; |
626 } elseif (null !== $action) { |
626 } elseif (null !== $action) { |
627 $vars['action'] = $action; |
627 $vars['action'] = $action; |
628 } |
628 } |
|
629 |
|
630 $replacePattern = array('/[^a-z0-9]+$/i', '/^[^a-z0-9]+/i'); |
|
631 $vars['action'] = preg_replace($replacePattern, '', $vars['action']); |
629 |
632 |
630 $inflector = $this->getInflector(); |
633 $inflector = $this->getInflector(); |
631 if ($this->getNoController() || $this->getNeverController()) { |
634 if ($this->getNoController() || $this->getNeverController()) { |
632 $this->_setInflectorTarget($this->getViewScriptPathNoControllerSpec()); |
635 $this->_setInflectorTarget($this->getViewScriptPathNoControllerSpec()); |
633 } else { |
636 } else { |