tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-06-30 08:29:35 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #180 from micmania1/fix-unnecessary-redirect

Browse Source 
FIX: Removed unnecessary redirect.
This commit is contained in:
Damian Mooyman 2015-02-24 14:52:11 +13:00
commit bf8d30d361
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/extensions/LeftAndMainSubsites.php
View File

@ -217,12 +217,10 @@ class LeftAndMainSubsites extends Extension {
// Update current subsite in session
Subsite::changeSubsite($_GET['SubsiteID']);
if ($this->owner->canView(Member::currentUser())) {
//Redirect to clear the current page
return $this->owner->redirect($this->owner->Link());
if (!$this->owner->canView(Member::currentUser())) {
//Redirect to the default CMS section
return $this->owner->redirect('admin/');
}
//Redirect to the default CMS section
return $this->owner->redirect('admin/');
}
// Automatically redirect the session to appropriate subsite when requesting a record.
@ -234,12 +232,10 @@ class LeftAndMainSubsites extends Extension {
// Update current subsite in session
Subsite::changeSubsite($record->SubsiteID);
if ($this->owner->canView(Member::currentUser())) {
//Redirect to clear the current page
return $this->owner->redirect($this->owner->Link());
if (!$this->owner->canView(Member::currentUser())) {
//Redirect to the default CMS section
return $this->owner->redirect('admin/');
}
//Redirect to the default CMS section
return $this->owner->redirect('admin/');
}
}