From 31dd9617e8ccde3b90cb8fe568531209aed7d17d Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Wed, 3 Mar 2021 15:44:31 +0300 Subject: [PATCH 1/2] Issues-408 --- vanilla/library/core/functions.render.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vanilla/library/core/functions.render.php b/vanilla/library/core/functions.render.php index c488c05..4a7f747 100644 --- a/vanilla/library/core/functions.render.php +++ b/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) : ''); } } From 06701f068413ff394885fe583069035136d8ada8 Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Wed, 3 Mar 2021 15:51:39 +0300 Subject: [PATCH 2/2] Hide NewDiscussion module in DiscussionsContoller --- .../controllers/class.discussionscontroller.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vanilla/applications/vanilla/controllers/class.discussionscontroller.php b/vanilla/applications/vanilla/controllers/class.discussionscontroller.php index 557163d..e8b9394 100644 --- a/vanilla/applications/vanilla/controllers/class.discussionscontroller.php +++ b/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');