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 #126 from mateusz/session-fix

Browse Source 
Do not change the session-stored subsite, if session is not enabled.
This commit is contained in:
Stig Lindqvist 2013-11-25 16:35:57 -08:00
commit e6f054f55b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/model/Subsite.php
View File

@ -123,11 +123,15 @@ class Subsite extends DataObject implements PermissionProvider {
* @param int|Subsite $subsite Either the ID of the subsite, or the subsite object itself
*/
public static function changeSubsite($subsite) {
// Session subsite change only meaningful if the session is active.
// Otherwise we risk setting it to wrong value, e.g. if we rely on currentSubsiteID.
if (!Subsite::$use_session_subsiteid) return;
if(is_object($subsite)) $subsiteID = $subsite->ID;
else $subsiteID = $subsite;
Session::set('SubsiteID', (int)$subsiteID);
// Set locale
if (is_object($subsite) && $subsite->Language != '') {
$locale = i18n::get_locale_from_lang($subsite->Language);
@ -135,8 +139,8 @@ class Subsite extends DataObject implements PermissionProvider {
i18n::set_locale($locale);
}
}
Permission::flush_permission_cache();
Permission::flush_permission_cache();
}
/**