tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Removed unnecessary redirect. This is early enough in the script that the correct subsite will be used from hereon.

Browse Source
This commit is contained in:
micmania1 2015-02-17 01:13:56 +00:00
parent ebebff248f
commit 3ca2861c2d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/extensions/LeftAndMainSubsites.php
View File

@ -217,13 +217,11 @@ class LeftAndMainSubsites extends Extension {
// Update current subsite in session // Update current subsite in session
Subsite::changeSubsite($_GET['SubsiteID']); Subsite::changeSubsite($_GET['SubsiteID']);
if ($this->owner->canView(Member::currentUser())) { if (!$this->owner->canView(Member::currentUser())) {
//Redirect to clear the current page
return $this->owner->redirect($this->owner->Link());
}
//Redirect to the default CMS section //Redirect to the default CMS section
return $this->owner->redirect('admin/'); return $this->owner->redirect('admin/');
} }
}
// Automatically redirect the session to appropriate subsite when requesting a record. // Automatically redirect the session to appropriate subsite when requesting a record.
// This is needed to properly initialise the session in situations where someone opens the CMS via a link. // This is needed to properly initialise the session in situations where someone opens the CMS via a link.
@ -234,13 +232,11 @@ class LeftAndMainSubsites extends Extension {
// Update current subsite in session // Update current subsite in session
Subsite::changeSubsite($record->SubsiteID); Subsite::changeSubsite($record->SubsiteID);
if ($this->owner->canView(Member::currentUser())) { if (!$this->owner->canView(Member::currentUser())) {
//Redirect to clear the current page
return $this->owner->redirect($this->owner->Link());
}
//Redirect to the default CMS section //Redirect to the default CMS section
return $this->owner->redirect('admin/'); return $this->owner->redirect('admin/');
} }
}
} }