Fix topicAction routes

beaver-dev · beaver-dev · commit 4c1df6283921 · 2016-03-28T18:48:43.000+02:00
There was a duplicate in routes.php. The name of the topic was added in
URL.
diff --git a/featherbb/Model/Forum.php b/featherbb/Model/Forum.php
@@ -221,7 +221,7 @@ public function print_topics($forum_id, $sort_by, $start_from)
                     $cur_topic['item_status'] .= ' inew';
                     $cur_topic['icon_type'] = 'icon icon-new';
                     $cur_topic['subject_formatted'] = '<strong>'.$cur_topic['subject_formatted'].'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.Router::pathFor('topicAction', ['id' => $cur_topic['id'], 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.Router::pathFor('topicAction', ['id' => $cur_topic['id'], 'name' => $url_subject, 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/featherbb/Model/Search.php b/featherbb/Model/Search.php
@@ -755,7 +755,7 @@ public function display_search_results($search)
                     $cur_search['item_status'] .= ' inew';
                     $cur_search['icon_type'] = 'icon icon-new';
                     $subject = '<strong>'.$subject.'</strong>';
-                    $subject_new_posts = '<span class="newtext">[ <a href="'.Router::pathFor('topicAction', ['id' => $cur_search['tid'], 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
+                    $subject_new_posts = '<span class="newtext">[ <a href="'.Router::pathFor('topicAction', ['id' => $cur_search['tid'], 'name' => $url_topic, 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';
                 } else {
                     $subject_new_posts = null;
                 }
diff --git a/featherbb/routes.php b/featherbb/routes.php
@@ -38,7 +38,7 @@
     Route::get('/{id:[0-9]+}[/{name:[\w\-]+}]', '\FeatherBB\Controller\Topic:display')->setName('Topic');
     Route::get('/{id:[0-9]+}/{name:[\w\-]+}/page/{page:[0-9]+}', '\FeatherBB\Controller\Topic:display')->setName('TopicPaginate');
     Route::get('/{id:[0-9]+}/{name:[\w\-]+}/post/{pid:[0-9]+}', '\FeatherBB\Controller\Topic:viewpost')->setName('viewPost');
-    Route::get('/{id:[0-9]+}/action/{action:[\w\-]+}', '\FeatherBB\Controller\Topic:action')->setName('topicAction');
+    Route::get('/{id:[0-9]+}/{name:[\w\-]+}/action/{action:[\w\-]+}', '\FeatherBB\Controller\Topic:action')->setName('topicAction');
     Route::get('/subscribe/{id:[0-9]+}[/{name:[\w\-]+}]', '\FeatherBB\Controller\Topic:subscribe')->add(new IsLogged)->setName('subscribeTopic');
     Route::get('/unsubscribe/{id:[0-9]+}[/{name:[\w\-]+}]', '\FeatherBB\Controller\Topic:unsubscribe')->add(new IsLogged)->setName('unsubscribeTopic');
     Route::get('/close/{id:[0-9]+}[/{name:[\w\-]+}]', '\FeatherBB\Controller\Topic:close')->add(new IsAdmMod)->setName('closeTopic');
@@ -47,7 +47,6 @@
     Route::get('/unstick/{id:[0-9]+}[/{name:[\w\-]+}]', '\FeatherBB\Controller\Topic:unstick')->add(new IsAdmMod)->setName('unstickTopic');
     Route::map(['GET', 'POST'], '/move/{id:[0-9]+}[/{name:[\w\-]+}/forum/{fid:[0-9]+}]', '\FeatherBB\Controller\Topic:move')->add(new IsAdmMod)->setName('moveTopic');
     Route::map(['GET', 'POST'], '/moderate/{id:[0-9]+}/forum/{fid:[0-9]+}[/page/{page:[0-9]+}]', '\FeatherBB\Controller\Topic:moderate')->add(new IsAdmMod)->setName('moderateTopic');
-    Route::get('/{id:[0-9]+}/action/{action}', '\FeatherBB\Controller\Topic{action}')->setName('topicAction');
 })->add(new CanReadBoard);
 
 // Post routes

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ public function print_topics($forum_id, $sort_by, $start_from)`
`221`	`221`	`$cur_topic['item_status'] .= ' inew';`
`222`	`222`	`$cur_topic['icon_type'] = 'icon icon-new';`
`223`	`223`	`$cur_topic['subject_formatted'] = '<strong>'.$cur_topic['subject_formatted'].'</strong>';`
`224`		`- $subject_new_posts = '<span class="newtext">[ <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3C%2Fspan%3E%27%3C%2Fspan%3E.Router%3A%3A%3Cspan+class%3D"pl-en">pathFor('topicAction', ['id' => $cur_topic['id'], 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';`
	`224`	`+ $subject_new_posts = '<span class="newtext">[ <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3C%2Fspan%3E%27%3C%2Fspan%3E.Router%3A%3A%3Cspan+class%3D"pl-en">pathFor('topicAction', ['id' => $cur_topic['id'], 'name' => $url_subject, 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';`
`225`	`225`	`} else {`
`226`	`226`	`$subject_new_posts = null;`
`227`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ public function display_search_results($search)`
`755`	`755`	`$cur_search['item_status'] .= ' inew';`
`756`	`756`	`$cur_search['icon_type'] = 'icon icon-new';`
`757`	`757`	`$subject = '<strong>'.$subject.'</strong>';`
`758`		`- $subject_new_posts = '<span class="newtext">[ <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3C%2Fspan%3E%27%3C%2Fspan%3E.Router%3A%3A%3Cspan+class%3D"pl-en">pathFor('topicAction', ['id' => $cur_search['tid'], 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';`
	`758`	`+ $subject_new_posts = '<span class="newtext">[ <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3C%2Fspan%3E%27%3C%2Fspan%3E.Router%3A%3A%3Cspan+class%3D"pl-en">pathFor('topicAction', ['id' => $cur_search['tid'], 'name' => $url_topic, 'action' => 'new']).'" title="'.__('New posts info').'">'.__('New posts').'</a> ]</span>';`
`759`	`759`	`} else {`
`760`	`760`	`$subject_new_posts = null;`
`761`	`761`	`}`