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

Merge pull request #63 from mateusz/top-level

Browse Source 
BUG Switch the subsite on GET parameter only.
This commit is contained in:
Sean Harvey 2012-11-04 17:31:37 -08:00
commit 3d59f10331
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/extensions/LeftAndMainSubsites.php
View File

@ -11,14 +11,14 @@ class LeftAndMainSubsites extends Extension {
Requirements::javascript('subsites/javascript/LeftAndMain_Subsites.js'); Requirements::javascript('subsites/javascript/LeftAndMain_Subsites.js');
Requirements::javascript('subsites/javascript/VirtualPage_Subsites.js'); Requirements::javascript('subsites/javascript/VirtualPage_Subsites.js');
if(isset($_REQUEST['SubsiteID'])) { if(isset($_GET['SubsiteID'])) {
// Clear current page when subsite changes (or is set for the first time) // Clear current page when subsite changes (or is set for the first time)
if(!Session::get('SubsiteID') || $_REQUEST['SubsiteID'] != Session::get('SubsiteID')) { if(!Session::get('SubsiteID') || $_GET['SubsiteID'] != Session::get('SubsiteID')) {
Session::clear("{$this->owner->class}.currentPage"); Session::clear("{$this->owner->class}.currentPage");
} }
// Update current subsite in session // Update current subsite in session
Subsite::changeSubsite($_REQUEST['SubsiteID']); Subsite::changeSubsite($_GET['SubsiteID']);
//Redirect to clear the current page //Redirect to clear the current page
$this->owner->redirect('admin/pages'); $this->owner->redirect('admin/pages');

4
code/model/Subsite.php
View File

@ -273,13 +273,13 @@ JS;
* *
* You can simulate subsite access without creating virtual hosts by appending ?SubsiteID=<ID> to the request. * You can simulate subsite access without creating virtual hosts by appending ?SubsiteID=<ID> to the request.
* *
* @todo Pass $request object from controller so we don't have to rely on $_REQUEST * @todo Pass $request object from controller so we don't have to rely on $_GET
* *
* @param boolean $cache * @param boolean $cache
* @return int ID of the current subsite instance * @return int ID of the current subsite instance
*/ */
static function currentSubsiteID() { static function currentSubsiteID() {
if(isset($_REQUEST['SubsiteID'])) $id = (int)$_REQUEST['SubsiteID']; if(isset($_GET['SubsiteID'])) $id = (int)$_GET['SubsiteID'];
else $id = Session::get('SubsiteID'); else $id = Session::get('SubsiteID');
if($id === NULL) { if($id === NULL) {