MergeTopics controller.

Signed-off-by: Norv <a.w.norv@gmail.com>
norv · May 4, 2013 · 9a0a3a9 · 9a0a3a9
1 parent cd6c376
commit 9a0a3a9
Show file tree

Hide file tree

Showing 2 changed files with 701 additions and 698 deletions.
diff --git a/sources/Dispatcher.class.php b/sources/Dispatcher.class.php
@@ -156,7 +156,7 @@ public function __construct()
 			'login2' => array('Auth.controller.php', 'Auth_Controller', 'action_login2'),
 			'logout' => array('Auth.controller.php', 'Auth_Controller', 'action_logout'),
 			'markasread' => array('Markasread.controller.php', 'markasread'),
-			'mergetopics' => array('MergeTopics.controller.php', 'action_mergetopics'),
+			'mergetopics' => array('MergeTopics.controller.php', 'MergeTopics_Controller', 'action_index'),
 			'memberlist' => array('Memberlist.controller.php', 'Memberlist_Controller', 'action_index'),
 			'moderate' => array('ModerationCenter.controller.php', 'action_modcenter'),
 			'karma' => array('Karma.controller.php', 'Karma_Controller', ''),