Skip to content

Issues-408 #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 3, 2021
Merged

Issues-408 #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31dd961
Issues-408
atelomycterus Mar 3, 2021
06701f0
Hide NewDiscussion module in DiscussionsContoller
atelomycterus Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions vanilla/applications/vanilla/controllers/class.discussionscontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -810,7 +810,7 @@ public function tagged() {
}

// Add Modules
$this->addModule('NewDiscussionModule');
// $this->addModule('NewDiscussionModule');
$this->addModule('DiscussionFilterModule');
$this->addModule('BookmarkedModule');

Expand Down
6 changes: 6 additions & 0 deletions vanilla/library/core/functions.render.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) : '');
}
}
Expand Down