--- a/web/lib/Zend/Controller/Router/Route/Regex.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Controller/Router/Route/Regex.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: Regex.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version $Id: Regex.php 24593 2012-01-05 20:35:02Z matthew $
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -28,7 +28,7 @@
*
* @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
*/
class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Abstract
@@ -74,7 +74,7 @@
public function match($path, $partial = false)
{
if (!$partial) {
- $path = trim(urldecode($path), '/');
+ $path = trim(urldecode($path), self::URI_DELIMITER);
$regex = '#^' . $this->_regex . '$#i';
} else {
$regex = '#^' . $this->_regex . '#i';