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

BUGFIX: Fixed subsite query rewriting with trunk query syntax

This commit is contained in:
Sam Minnee 2009-03-09 09:24:35 +00:00
parent afe75ea88e
commit 6037ec56e5
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/GroupSubsites.php
View File

@ -55,7 +55,7 @@ class GroupSubsites extends DataObjectDecorator {
if(Subsite::$disable_subsite_filter) return;
// If you're querying by ID, ignore the sub-site - this is a bit ugly...
if(!$query->where || (strpos($query->where[0], ".`ID` = ") === false && strpos($query->where[0], ".ID = ") === false)) {
if(!$query->where || (strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], ".`ID` = ") === false && strpos($query->where[0], ".ID = ") === false)) {
if($context = DataObject::context_obj()) $subsiteID = (int)$context->SubsiteID;
else $subsiteID = (int)Subsite::currentSubsiteID();

2
code/SiteTreeSubsites.php
View File

@ -46,7 +46,7 @@ class SiteTreeSubsites extends DataObjectDecorator {
if(Subsite::$disable_subsite_filter) return;
// If you're querying by ID, ignore the sub-site - this is a bit ugly...
if(!$query->where || (strpos($query->where[0], ".`ID` = ") === false && strpos($query->where[0], ".ID = ") === false && strpos($query->where[0], "ID = ") !== 0)) {
if(!$query->where || (strpos($query->where[0], ".\"ID\" = ") === false && strpos($query->where[0], ".`ID` = ") === false && strpos($query->where[0], ".ID = ") === false && strpos($query->where[0], "ID = ") !== 0)) {
if($context = DataObject::context_obj()) $subsiteID = (int)$context->SubsiteID;
else $subsiteID = (int)Subsite::currentSubsiteID();

1
code/Subsite.php
View File

@ -364,7 +364,6 @@ JS;
"`MemberID` = {$member->ID}",
'',
"LEFT JOIN `Group` ON `Subsite`.`ID` = `SubsiteID`
LEFT JOIN `Permission` ON `Group`.`ID` = `Permission`.`GroupID`
LEFT JOIN `Group_Members` ON `Group`.`ID` = `Group_Members`.`GroupID`"
);
}

2
tests/SubsiteTest.yml
View File

@ -53,7 +53,7 @@ Group:
Permissions: =>Permission.accesscmsmain1
subsite2_group:
Title: subsite2_group
Code: subsite1_group
Code: subsite2_group
Subsite: =>Subsite_Template.subsite2
Permissions: =>Permission.accesscmsmain2
Member: