Merge pull request #13 from harikt/path-issue

Fix the path issue
harikt · Jan 22, 2015 · 9cfb311 · 9cfb311
2 parents 0bc3e44 + 09ac69c
commit 9cfb311
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/config/routes.php b/config/routes.php
@@ -38,7 +38,7 @@
     ))
 ;
 
-$router->add('admin', '/admin/')
+$router->add('admin', '/admin')
     ->addValues(array(
         'controller' => 'admin',
     ))

diff --git a/src/Conduit/Middleware/RouterMiddleware.php b/src/Conduit/Middleware/RouterMiddleware.php
@@ -21,8 +21,9 @@ public function __construct(Router $router, Dispatcher $dispatcher)
 
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next = null)
     {
-        $path = $request->getUri()->getPath();
-        $route = $this->router->match($path, $request->getServerParams());
+        $server = $request->getServerParams();
+        $path = parse_url($server['REQUEST_URI'], PHP_URL_PATH);
+        $route = $this->router->match($path, $server);
         if (! $route) {
             return $next();
         }

diff --git a/templates/layout.html b/templates/layout.html
@@ -26,7 +26,7 @@
                 <li><a href="/">Home</a></li>
                 <li><a href="/blog">Blog</a></li>
                 <li><a href="/contact">Contact</a></li>
-                <li><a href="/admin/">Admin route</a></li>
+                <li><a href="/admin">Admin route</a></li>
                 <li><a href="/logout">Logout</a></li>
               </ul>
             </div><!-- /.nav-collapse -->