Merge pull request #457 from topcoder-platform/issues-408

Issues-408

Author: jmgasper

vanilla/applications/vanilla/controllers/class.discussionscontroller.php

@@ -115,7 +115,7 @@ public function index($Page = false) {
 
         // Add modules
         $this->addModule('DiscussionFilterModule');
-        $this->addModule('NewDiscussionModule');
+      //  $this->addModule('NewDiscussionModule');
       //  $this->addModule('CategoriesModule');
         $this->addModule('BookmarkedModule');
         $this->addModule('TagModule');
@@ -281,7 +281,7 @@ public function unread($page = '0') {
 
         // Add modules
         $this->addModule('DiscussionFilterModule');
-        $this->addModule('NewDiscussionModule');
+      //  $this->addModule('NewDiscussionModule');
       //  $this->addModule('CategoriesModule');
         $this->addModule('BookmarkedModule');
         $this->addModule('TagModule');
@@ -459,7 +459,7 @@ public function bookmarked($page = '0') {
         // Add modules
         $this->addModule('DiscussionFilterModule');
         $this->addModule('NewDiscussionModule');
-     //   $this->addModule('CategoriesModule');
+        // $this->addModule('CategoriesModule');
         $this->addModule('TagModule');
 
         // Render default view (discussions/bookmarked.php)
@@ -559,7 +559,7 @@ public function mine($page = 'p1') {
 
         // Add modules
         $this->addModule('DiscussionFilterModule');
-        $this->addModule('NewDiscussionModule');
+        // $this->addModule('NewDiscussionModule');
         // $this->addModule('CategoriesModule');
         $this->addModule('BookmarkedModule');
         $this->addModule('TagModule');
@@ -810,7 +810,7 @@ public function tagged() {
         }
 
         // Add Modules
-        $this->addModule('NewDiscussionModule');
+       // $this->addModule('NewDiscussionModule');
         $this->addModule('DiscussionFilterModule');
         $this->addModule('BookmarkedModule');
 

vanilla/library/core/functions.render.php

@@ -1723,6 +1723,12 @@ function signInUrl($target = '', $force = false) {
             }
         }
 
+       // FIX: https://github.com/topcoder-platform/forums/issues/383
+       // The '' and the default route navigates to a home page
+       if ($target === c('Routes.DefaultController')) {
+            $target = '' ;
+       }
+
         return '/entry/signin'.($target ? '?Target='.urlencode($target) : '');
     }
 }