diff options
| author | Arnold Daniels <arnold@jasny.net> | 2015-03-04 18:47:58 +0100 |
|---|---|---|
| committer | Arnold Daniels <arnold@jasny.net> | 2015-03-04 18:47:58 +0100 |
| commit | a32a9968c1c0d3529ba7bb10c0ec8c8097aceca2 (patch) | |
| tree | 5148f83ee70b5630d7f806b3f515733c5093ed62 | |
| parent | 2a5c5fa54c04021b2014e07a218d540e07cc7fd4 (diff) | |
| parent | 4dfb5b8bcbf6c3acab76e5052268532a0af71fd9 (diff) | |
| download | router-a32a9968c1c0d3529ba7bb10c0ec8c8097aceca2.zip router-a32a9968c1c0d3529ba7bb10c0ec8c8097aceca2.tar.gz router-a32a9968c1c0d3529ba7bb10c0ec8c8097aceca2.tar.bz2 | |
Merge pull request #8 from moesjarraf/master
Revert Router and fix for Controller
| -rw-r--r-- | src/Controller.php | 2 | ||||
| -rw-r--r-- | src/Router.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Controller.php b/src/Controller.php index 42a283b..8c0999b 100644 --- a/src/Controller.php +++ b/src/Controller.php @@ -170,7 +170,7 @@ abstract class Controller */ protected function back() { - $this->redirect($this->router->getLocalReferer() ?: '/', 303); + $this->redirect($this->getLocalReferer() ?: '/', 303); } /** diff --git a/src/Router.php b/src/Router.php index d18ed3e..d9a5626 100644 --- a/src/Router.php +++ b/src/Router.php @@ -253,7 +253,7 @@ class Router $this->getRoutes(); // Make sure the routes are initialised $ret = null; - $url = '/' . trim($url, '/'); + if ($url !== '/') $url = rtrim($url, '/'); if (substr($url, 0, 2) == '/:') $url = substr($url, 2); foreach (array_keys($this->routes) as $route) { |