Skip to content

Commit 115c8e5

Browse files
Simon SessingøSimon Sessingø
authored andcommitted
[BUGFIX] Added urldecode to RouterRessource, RouterRoute and
RouterController class to ensure that urls with special letters can be picked up by a custom regular expression (read documentation: match).
1 parent 35ee79d commit 115c8e5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/Pecee/SimpleRouter/RouterController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function renderRoute(Request $request) {
4343
}
4444

4545
public function matchRoute(Request $request) {
46-
$url = parse_url($request->getUri());
46+
$url = parse_url(urldecode($request->getUri()));
4747
$url = rtrim($url['path'], '/') . '/';
4848

4949
if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {

src/Pecee/SimpleRouter/RouterResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected function call($method, $parameters) {
4646
}
4747

4848
public function matchRoute(Request $request) {
49-
$url = parse_url($request->getUri());
49+
$url = parse_url(urldecode($request->getUri()));
5050
$url = rtrim($url['path'], '/') . '/';
5151

5252
$route = rtrim($this->url, '/') . '/{id?}/{action?}';

src/Pecee/SimpleRouter/RouterRoute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function __construct($url, $callback) {
2121

2222
public function matchRoute(Request $request) {
2323

24-
$url = parse_url($request->getUri());
24+
$url = parse_url(urldecode($request->getUri()));
2525
$url = rtrim($url['path'], '/') . '/';
2626

2727
// Match on custom defined regular expression

0 commit comments

Comments
 (0)