浏览代码

replaced some url..code by rawurl..code

Fabien Potencier 14 年之前
父节点
当前提交
c7fddca891

+ 2 - 2
src/Symfony/Component/HttpFoundation/Request.php

@@ -501,8 +501,8 @@ class Request
                 $parts[] = $segment;
                 $order[] = $segment;
             } else {
-                $tmp = explode('=', urldecode($segment), 2);
-                $parts[] = urlencode($tmp[0]).'='.urlencode($tmp[1]);
+                $tmp = explode('=', rawurldecode($segment), 2);
+                $parts[] = rawurlencode($tmp[0]).'='.rawurlencode($tmp[1]);
                 $order[] = $tmp[0];
             }
         }

+ 1 - 1
src/Symfony/Component/Routing/Generator/UrlGenerator.php

@@ -114,7 +114,7 @@ class UrlGenerator implements UrlGeneratorInterface
 
                     if (!$isEmpty || !$optional) {
                         // %2F is not valid in a URL, so we don't encode it (which is fine as the requirements explicitly allowed it)
-                        $url = $token[1].str_replace('%2F', '/', urlencode($tparams[$token[3]])).$url;
+                        $url = $token[1].str_replace('%2F', '/', rawurlencode($tparams[$token[3]])).$url;
                     }
 
                     $optional = false;

+ 1 - 1
src/Symfony/Component/Routing/Matcher/UrlMatcher.php

@@ -125,7 +125,7 @@ class UrlMatcher implements UrlMatcherInterface
         $parameters = $defaults;
         foreach ($params as $key => $value) {
             if (!is_int($key)) {
-                $parameters[$key] = urldecode($value);
+                $parameters[$key] = rawurldecode($value);
             }
         }