FIX, checking to ensure there's a current controller.

nglasl · Jun 26, 2017 · d5b8724 · d5b8724
1 parent 5a589a3
commit d5b8724
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # [misdirection](https://packagist.org/packages/nglasl/silverstripe-misdirection)
 
-_The current release is **2.2.22**_
+_The current release is **2.2.23**_
 
 > A module for SilverStripe which will allow both simple and regular expression link redirections based on customisable mappings, either hooking into a page not found or replacing the default automated URL handling.
 

diff --git a/code/extensions/SiteTreeMisdirectionExtension.php b/code/extensions/SiteTreeMisdirectionExtension.php
@@ -52,7 +52,7 @@ public function onBeforeWrite() {
 
 		// Retrieve the vanity mapping URL, where this is only possible using the POST variable.
 
-		$vanityURL = (is_null($controller = Controller::curr()) || is_null($URL = $controller->getRequest()->postVar('VanityURL'))) ? $this->owner->VanityMapping()->MappedLink : $URL;
+		$vanityURL = (!Controller::has_curr() || is_null($controller = Controller::curr()) || is_null($URL = $controller->getRequest()->postVar('VanityURL'))) ? $this->owner->VanityMapping()->MappedLink : $URL;
 		$mappingExists = $this->owner->VanityMapping()->exists();
 
 		// Determine whether the vanity mapping URL has been updated.

diff --git a/code/services/MisdirectionService.php b/code/services/MisdirectionService.php
@@ -82,7 +82,7 @@ public function getMapping($URL, $host = null) {
 
 		// Enforce any hostname restriction that may have been defined.
 
-		if(is_null($host) && ($controller = Controller::curr())) {
+		if(is_null($host) && Controller::has_curr() && ($controller = Controller::curr())) {
 			$host = $controller->getRequest()->getHeader('Host');
 		}
 		$temporary = $host;