FIX, a site object fallback will now actually be used.

nglasl · Mar 27, 2017 · d78a758 · d78a758
1 parent 30f057e
commit d78a758
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/code/services/MisdirectionService.php b/code/services/MisdirectionService.php
@@ -262,9 +262,12 @@ public function determineFallback($URL) {
 			if(ClassInfo::exists('Multisites')) {
 				$parent = Multisites::inst()->getCurrentSite();
 				$parentID = $parent->ID;
-				$applicableRule = $parent->Fallback;
-				$toURL = $parent->FallbackLink;
-				$responseCode = $parent->FallbackResponseCode;
+				if($parent->Fallback) {
+					$applicableRule = $parent->Fallback;
+					$nearestParent = $thisPage = Director::baseURL();
+					$toURL = $parent->FallbackLink;
+					$responseCode = $parent->FallbackResponseCode;
+				}
 			}
 			else {
 				$parentID = 0;