Correcting an issue where invalid regular expressions would cause PHP…

… warnings.
nglasl · Feb 25, 2016 · 6b4632d · 6b4632d
1 parent 7f52067
commit 6b4632d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/code/dataobjects/LinkMapping.php b/code/dataobjects/LinkMapping.php
@@ -281,10 +281,16 @@ public function getCMSFields() {
 	public function validate() {
 
 		$result = parent::validate();
-		if($this->ValidateExternal && $this->RedirectLink && $result->valid() && !MisdirectionService::is_external_URL($this->RedirectLink)) {
 
-			// Use third party validation to determine an external URL (https://gist.github.com/dperini/729294 and http://mathiasbynens.be/demo/url-regex).
+		// Determine whether a regular expression mapping is possible to match against.
+
+		if(($this->LinkType === 'Regular Expression') && $result->valid() && (!$this->MappedLink || !is_numeric(@preg_match("%{$this->MappedLink}%", null)))) {
+			$result->error('Invalid regular expression!');
+		}
 
+		// Use third party validation to determine an external URL (https://gist.github.com/dperini/729294 and http://mathiasbynens.be/demo/url-regex).
+
+		if($this->ValidateExternal && $this->RedirectLink && $result->valid() && !MisdirectionService::is_external_URL($this->RedirectLink)) {
 			$result->error('External URL validation failed!');
 		}