diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Controller/Router/Route/Module.php --- a/web/lib/Zend/Controller/Router/Route/Module.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Controller/Router/Route/Module.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Module.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Module.php 24593 2012-01-05 20:35:02Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,18 +30,13 @@ * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_Abstract { /** - * URI delimiter - */ - const URI_DELIMITER = '/'; - - /** * Default values for the route (ie. module, controller, action, params) * @var array */ @@ -237,29 +232,29 @@ if (is_array($value)) { foreach ($value as $arrayValue) { $arrayValue = ($encode) ? urlencode($arrayValue) : $arrayValue; - $url .= '/' . $key; - $url .= '/' . $arrayValue; + $url .= self::URI_DELIMITER . $key; + $url .= self::URI_DELIMITER . $arrayValue; } } else { if ($encode) $value = urlencode($value); - $url .= '/' . $key; - $url .= '/' . $value; + $url .= self::URI_DELIMITER . $key; + $url .= self::URI_DELIMITER . $value; } } if (!empty($url) || $action !== $this->_defaults[$this->_actionKey]) { if ($encode) $action = urlencode($action); - $url = '/' . $action . $url; + $url = self::URI_DELIMITER . $action . $url; } if (!empty($url) || $controller !== $this->_defaults[$this->_controllerKey]) { if ($encode) $controller = urlencode($controller); - $url = '/' . $controller . $url; + $url = self::URI_DELIMITER . $controller . $url; } if (isset($module)) { if ($encode) $module = urlencode($module); - $url = '/' . $module . $url; + $url = self::URI_DELIMITER . $module . $url; } return ltrim($url, self::URI_DELIMITER);