Use 'Forum' route instead of 'ForumPaginate'

beaver-dev · beaver-dev · commit e92dcf024e85 · 2016-03-28T21:03:28.000+02:00
diff --git a/featherbb/Controller/Forum.php b/featherbb/Controller/Forum.php
@@ -63,10 +63,10 @@ public function display($req, $res, $args)
         View::addAsset('canonical', Router::pathFor('Forum', ['id' => $args['fid'], 'name' => $url_forum]));
         if ($num_pages > 1) {
             if ($p > 1) {
-                View::addAsset('prev', Router::pathFor('ForumPaginate', ['id' => $args['fid'], 'name' => $url_forum, 'page' => intval($p-1)]));
+                View::addAsset('prev', Router::pathFor('Forum', ['id' => $args['fid'], 'name' => $url_forum, 'page' => intval($p-1)]));
             }
             if ($p < $num_pages) {
-                View::addAsset('next', Router::pathFor('ForumPaginate', ['id' => $args['fid'], 'name' => $url_forum, 'page' => intval($p+1)]));
+                View::addAsset('next', Router::pathFor('Forum', ['id' => $args['fid'], 'name' => $url_forum, 'page' => intval($p+1)]));
             }
         }
 
diff --git a/featherbb/routes.php b/featherbb/routes.php
@@ -24,8 +24,7 @@
 
 // Forum
 Route::group('/forum', function() {
-    Route::get('/{id:[0-9]+}[/{name:[\w\-]+}]', '\FeatherBB\Controller\Forum:display')->setName('Forum');
-    Route::get('/{id:[0-9]+}/{name:[\w\-]+}/page/{page:[0-9]+}', '\FeatherBB\Controller\Forum:display')->setName('ForumPaginate');
+    Route::get('/{id:[0-9]+}/{name:[\w\-]+}[/page/{page:\d+}]', '\FeatherBB\Controller\Forum:display')->setName('Forum');
     Route::get('/mark-read/{id:[0-9]+}[/{name:[\w\-]+}]', '\FeatherBB\Controller\Forum:markread')->add(new IsLogged)->setName('markForumRead');
     Route::get('/subscribe/{id:[0-9]+}[/{name:[\w\-]+}]', '\FeatherBB\Controller\Forum:subscribe')->add(new IsLogged)->setName('subscribeForum');
     Route::get('/unsubscribe/{id:[0-9]+}[/{name:[\w\-]+}]', '\FeatherBB\Controller\Forum:unsubscribe')->add(new IsLogged)->setName('unsubscribeForum');

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,10 @@ public function display($req, $res, $args)`
`63`	`63`	`View::addAsset('canonical', Router::pathFor('Forum', ['id' => $args['fid'], 'name' => $url_forum]));`
`64`	`64`	`if ($num_pages > 1) {`
`65`	`65`	`if ($p > 1) {`
`66`		`- View::addAsset('prev', Router::pathFor('ForumPaginate', ['id' => $args['fid'], 'name' => $url_forum, 'page' => intval($p-1)]));`
	`66`	`+ View::addAsset('prev', Router::pathFor('Forum', ['id' => $args['fid'], 'name' => $url_forum, 'page' => intval($p-1)]));`
`67`	`67`	`}`
`68`	`68`	`if ($p < $num_pages) {`
`69`		`- View::addAsset('next', Router::pathFor('ForumPaginate', ['id' => $args['fid'], 'name' => $url_forum, 'page' => intval($p+1)]));`
	`69`	`+ View::addAsset('next', Router::pathFor('Forum', ['id' => $args['fid'], 'name' => $url_forum, 'page' => intval($p+1)]));`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`