diff --git a/code/extensions/LeftAndMainSubsites.php b/code/extensions/LeftAndMainSubsites.php index 081ac85..22cf963 100644 --- a/code/extensions/LeftAndMainSubsites.php +++ b/code/extensions/LeftAndMainSubsites.php @@ -11,14 +11,14 @@ class LeftAndMainSubsites extends Extension { Requirements::javascript('subsites/javascript/LeftAndMain_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) - if(!Session::get('SubsiteID') || $_REQUEST['SubsiteID'] != Session::get('SubsiteID')) { + if(!Session::get('SubsiteID') || $_GET['SubsiteID'] != Session::get('SubsiteID')) { Session::clear("{$this->owner->class}.currentPage"); } // Update current subsite in session - Subsite::changeSubsite($_REQUEST['SubsiteID']); + Subsite::changeSubsite($_GET['SubsiteID']); //Redirect to clear the current page $this->owner->redirect('admin/pages'); diff --git a/code/model/Subsite.php b/code/model/Subsite.php index 3fb25b5..77d9780 100644 --- a/code/model/Subsite.php +++ b/code/model/Subsite.php @@ -273,13 +273,13 @@ JS; * * You can simulate subsite access without creating virtual hosts by appending ?SubsiteID= 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 * @return int ID of the current subsite instance */ static function currentSubsiteID() { - if(isset($_REQUEST['SubsiteID'])) $id = (int)$_REQUEST['SubsiteID']; + if(isset($_GET['SubsiteID'])) $id = (int)$_GET['SubsiteID']; else $id = Session::get('SubsiteID'); if($id === NULL) {