This fixes #13. Now shows UtilityPage even on 404

Darren-Lee Joseph · Darren-Lee Joseph · commit 891f3f63cea7 · 2015-10-15T02:03:44.000+01:00
diff --git a/code/MaintenanceModeExtension.php b/code/MaintenanceModeExtension.php
@@ -46,7 +46,11 @@ public function onBeforeInit() {
 		if (!$utilityPage->config()->DisableRedirect) {
 			//If this is not the utility page, do a temporary (302) redirect to it
 			if($this->owner->dataRecord->ClassName != "UtilityPage") {
-				return $this->owner->redirect($utilityPage->AbsoluteLink(), 302);
+				$response = new SS_HTTPResponse();
+				$response->redirect($utilityPage->AbsoluteLink(), 302);
+				HTTP::add_cache_headers($response);
+				$response->output();
+				die();
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,11 @@ public function onBeforeInit() {`
`46`	`46`	`if (!$utilityPage->config()->DisableRedirect) {`
`47`	`47`	`//If this is not the utility page, do a temporary (302) redirect to it`
`48`	`48`	`if($this->owner->dataRecord->ClassName != "UtilityPage") {`
`49`		`- return $this->owner->redirect($utilityPage->AbsoluteLink(), 302);`
	`49`	`+ $response = new SS_HTTPResponse();`
	`50`	`+ $response->redirect($utilityPage->AbsoluteLink(), 302);`
	`51`	`+ HTTP::add_cache_headers($response);`
	`52`	`+ $response->output();`
	`53`	`+ die();`
`50`	`54`	`}`
`51`	`55`	`}`
`52`	`56`