Merge pull request #69 from skipperbent/development

[BUGFIX] Bugfix
This commit is contained in:
Simon Sessingø
2016-03-01 22:52:38 +01:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ class RouterController extends RouterEntry {
}
public function matchRoute(Request $request) {
$url = parse_url($request->getUri());
$url = parse_url(urldecode($request->getUri()));
$url = rtrim($url['path'], '/') . '/';
if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {
+1 -1
View File
@@ -46,7 +46,7 @@ class RouterResource extends RouterEntry {
}
public function matchRoute(Request $request) {
$url = parse_url($request->getUri());
$url = parse_url(urldecode($request->getUri()));
$url = rtrim($url['path'], '/') . '/';
$route = rtrim($this->url, '/') . '/{id?}/{action?}';
+1 -1
View File
@@ -21,7 +21,7 @@ class RouterRoute extends RouterEntry {
public function matchRoute(Request $request) {
$url = parse_url($request->getUri());
$url = parse_url(urldecode($request->getUri()));
$url = rtrim($url['path'], '/') . '/';
// Match on custom defined regular expression