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

BUGFIX Consistently resetting Subsite::$disable_subsite_filter to its original state (if the module is installed)

Browse Source
This commit is contained in:
Ingo Schommer 2011-10-07 09:38:11 +02:00
parent 6ab1340680
commit e26d249d60
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/model/SiteTree.php
View File

@ -1665,7 +1665,10 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
* @param $includeVirtuals Set to false to exlcude virtual pages. * @param $includeVirtuals Set to false to exlcude virtual pages.
*/ */
function DependentPages($includeVirtuals = true) { function DependentPages($includeVirtuals = true) {
if(is_callable('Subsite::disable_subsite_filter')) Subsite::disable_subsite_filter(true); if(class_exists('Subsite')) {
$origDisableSubsiteFilter = Subsite::$disable_subsite_filter;
Subsite::disable_subsite_filter(true);
}
// Content links // Content links
$items = new ArrayList(); $items = new ArrayList();
@ -1692,7 +1695,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$items->merge($redirectors); $items->merge($redirectors);
} }
if(is_callable('Subsite::disable_subsite_filter')) Subsite::disable_subsite_filter(false); if(class_exists('Subsite')) Subsite::disable_subsite_filter($origDisableSubsiteFilter);
return $items; return $items;
} }