Просмотр исходного кода

ZF-3681
Zend_Controller
Defined constant URI_DELIMITER in Zend_Controller_Router_Abstract
Updated individual router classes to use URI_DELIMITER


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24181 44c647ce-9c0f-0410-b52a-842ac1e357ba

adamlundrigan 14 лет назад
Родитель
Сommit
2c6fe3b9ce

+ 5 - 0
library/Zend/Controller/Router/Abstract.php

@@ -37,6 +37,11 @@ require_once 'Zend/Controller/Router/Interface.php';
 abstract class Zend_Controller_Router_Abstract implements Zend_Controller_Router_Interface
 {
     /**
+     * URI delimiter
+     */
+    const URI_DELIMITER = '/';
+    
+    /**
      * Front controller instance
      * @var Zend_Controller_Front
      */

+ 1 - 1
library/Zend/Controller/Router/Rewrite.php

@@ -470,7 +470,7 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
         $url   = $route->assemble($params, $reset, $encode);
 
         if (!preg_match('|^[a-z]+://|', $url)) {
-            $url = rtrim($this->getFrontController()->getBaseUrl(), '/') . '/' . $url;
+            $url = rtrim($this->getFrontController()->getBaseUrl(), self::URI_DELIMITER) . self::URI_DELIMITER . $url;
         }
 
         return $url;

+ 1 - 1
library/Zend/Controller/Router/Route.php

@@ -77,7 +77,7 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
     protected $_translatable = array();
 
     protected $_urlVariable = ':';
-    protected $_urlDelimiter = '/';
+    protected $_urlDelimiter = self::URI_DELIMITER;
     protected $_regexDelimiter = '#';
     protected $_defaultRegex = null;