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

BUGFIX allow Subsite Virtual Pages to share a URL Segment (from r82346)

Browse Source
This commit is contained in:
Tom Rix 2010-03-01 02:56:01 +00:00
parent 4801838dd0
commit 40ff605fbf
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/SiteTreeSubsites.php
View File

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

12
code/SubsitesVirtualPage.php
View File

@ -65,18 +65,6 @@ class SubsitesVirtualPage extends VirtualPage {
return $fields; return $fields;
} }
function onBeforeWrite() {
Subsite::$disable_subsite_filter = true;
parent::onBeforeWrite();
}
function onAfterWrite() {
Subsite::$disable_subsite_filter = false;
parent::onAfterWrite();
}
} }
class SubsitesVirtualPage_Controller extends VirtualPage_Controller { class SubsitesVirtualPage_Controller extends VirtualPage_Controller {