From e26d249d606009a6f4fb91ff19bfba66afffeaff Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 7 Oct 2011 09:38:11 +0200
Subject: [PATCH] BUGFIX Consistently resetting
 Subsite::$disable_subsite_filter to its original state (if the module is
 installed)

---
 code/model/SiteTree.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php
index bd473dc0..89d8e0b2 100644
--- a/code/model/SiteTree.php
+++ b/code/model/SiteTree.php
@@ -1665,7 +1665,10 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 	 * @param $includeVirtuals Set to false to exlcude virtual pages.
 	 */
 	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
         $items = new ArrayList();
@@ -1692,7 +1695,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 			$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;
 	}