wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

params urlencode, #16

Browse Source 
git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/evo@136 4cb57b5f-5bbd-dd11-951b-001d605cbbc5
This commit is contained in:
pzinovkin
2010-03-26 15:47:13 +00:00
parent 7ee83329d9
commit cb3ac1a04f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/router/Route.php
View File

@ -39,7 +39,7 @@ class Route
for ($i = 0; $i < $cnt; $i++) { for ($i = 0; $i < $cnt; $i++) {
if (substr($parts[$i], 0, 1) == ':') { if (substr($parts[$i], 0, 1) == ':') {
$this->params[substr($parts[$i], 1)] = $request[$i]; $this->params[substr($parts[$i], 1)] = urldecode($request[$i]);
} elseif (substr($parts[$i], 0, 2) == '(?') { } elseif (substr($parts[$i], 0, 2) == '(?') {
$match = array(); $match = array();
if (!preg_match('#^' . $parts[$i] . '$#iu', $request[$i], $match)) { if (!preg_match('#^' . $parts[$i] . '$#iu', $request[$i], $match)) {
@ -47,7 +47,7 @@ class Route
} }
$start = strpos($parts[$i], '<') + 1; $start = strpos($parts[$i], '<') + 1;
$key = substr($parts[$i], $start, strpos($parts[$i], '>', $start) - $start); $key = substr($parts[$i], $start, strpos($parts[$i], '>', $start) - $start);
$this->params[$key] = $match[$key]; $this->params[$key] = urldecode($match[$key]);
} elseif ($parts[$i] != $request[$i]) { } elseif ($parts[$i] != $request[$i]) {
return false; return false;
} }