Skip to content

Y
yii2
Commit e56d60ad by Qiang Xue
Options

Escape special chars in URL rules.

parent bfa7c801
Showing with 10 additions and 2 deletions
framework/yii/web/UrlRule.php
...@@ -143,7 +143,16 @@ class UrlRule extends Object ...@@ -143,7 +143,16 @@ class UrlRule extends Object
} }
} }
$tr = $tr2 = []; $tr = [
'.' => '\\.',
'*' => '\\*',
'$' => '\\$',
'[' => '\\[',
']' => '\\]',
'(' => '\\(',
')' => '\\)',
];
$tr2 = [];
if (preg_match_all('/<(\w+):?([^>]+)?>/', $this->pattern, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { if (preg_match_all('/<(\w+):?([^>]+)?>/', $this->pattern, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
foreach ($matches as $match) { foreach ($matches as $match) {
$name = $match[1][0]; $name = $match[1][0];
...@@ -166,7 +175,6 @@ class UrlRule extends Object ...@@ -166,7 +175,6 @@ class UrlRule extends Object
} }
} }
} }
$tr['.'] = '\\.';
$this->_template = preg_replace('/<(\w+):?([^>]+)?>/', '<$1>', $this->pattern); $this->_template = preg_replace('/<(\w+):?([^>]+)?>/', '<$1>', $this->pattern);
$this->pattern = '#^' . trim(strtr($this->_template, $tr), '/') . '$#u'; $this->pattern = '#^' . trim(strtr($this->_template, $tr), '/') . '$#u';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment