tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #30 from hafriedlander/fix/subsitesvariant 

FIX subsites not activating after recent subsite session changes
This commit is contained in:
Stig Lindqvist 2013-09-16 20:33:42 -07:00
parent 7afe5594f7 b75e243276
commit 7dd8d888cf
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/search/SearchVariantSubsites.php
View File

@ -31,14 +31,10 @@ class SearchVariantSubsites extends SearchVariant {
} }
function activateState($state) { function activateState($state) {
if (Controller::has_curr()) { // We always just set the $_GET variable rather than store in Session - this always works, has highest priority
Subsite::changeSubsite($state); // in Subsite::currentSubsiteID() and doesn't persist unlike Subsite::changeSubsite
} $_GET['SubsiteID'] = $state;
else { Permission::flush_permission_cache();
// TODO: This is a nasty hack - calling Subsite::changeSubsite after request ends
// throws error because no current controller to access session on
$_GET['SubsiteID'] = $state;
}
} }
function alterDefinition($base, $index) { function alterDefinition($base, $index) {