The current controller is now only retrieved once.

nglasl · Feb 25, 2016 · 7f52067 · 7f52067
1 parent d13ce54
commit 7f52067
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/code/services/MisdirectionService.php b/code/services/MisdirectionService.php
@@ -76,8 +76,8 @@ public function getMapping($URL, $host = null) {
 
 		// Enforce any hostname restriction that may have been defined.
 
-		if(is_null($host) && Controller::curr()) {
-			$host = Controller::curr()->getRequest()->getHeader('Host');
+		if(is_null($host) && ($controller = Controller::curr())) {
+			$host = $controller->getRequest()->getHeader('Host');
 		}
 		$matches = $matches->where("(HostnameRestriction IS NULL) OR (HostnameRestriction = '" . Convert::raw2sql($host) . "')");
 		$regex = clone $matches;