Merge branch 'hotfix/blog-url'

weierophinney · Mar 6, 2015 · 9adece6 · 9adece6
2 parents b33cf3d + b79906f
commit 9adece6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Blog/EngineMiddleware.php b/src/Blog/EngineMiddleware.php
@@ -35,7 +35,7 @@ public function __invoke($req, $res, $next)
             return $this->listPosts($req, $res, $next, $tag);
         }
 
-        if (preg_match('#^/(?P<id>[^/]+)\.html$#', $path, $matches)) {
+        if (preg_match('#^/+(?P<id>[^/]+)\.html$#', $path, $matches)) {
             return $this->displayPost($matches['id'], $req, $res, $next);
         }
 

diff --git a/src/Blog/EntryView.php b/src/Blog/EntryView.php
@@ -19,7 +19,7 @@ class EntryView
 
     public function __construct(array $entry, $basePath, array $disqus)
     {
-        $this->basePath = $basePath;
+        $this->basePath = rtrim($basePath, '/');
         $this->disqus   = $disqus;
 
         foreach ($entry as $key => $value) {