Correcting an issue where fallback URLs were not being resolved as ex…

…pected.
nglasl · Jun 6, 2016 · 64f16e5 · 64f16e5
1 parent 4ef298d
commit 64f16e5
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/code/services/MisdirectionService.php b/code/services/MisdirectionService.php
@@ -292,19 +292,25 @@ public function determineFallback($URL) {
 			if($applicableRule) {
 				$link = null;
 				switch($applicableRule) {
+
+					// Bypass the request filter.
+
 					case 'Nearest':
-						$link = $nearestParent;
+						$link = '/' . HTTP::setGetVar('misdirected', true, $nearestParent);
 						break;
 					case 'This':
-						$link = $thisPage;
+						$link = '/' . HTTP::setGetVar('misdirected', true, $thisPage);
 						break;
 					case 'URL':
-						$link = self::is_external_URL($toURL) ? (ClassInfo::exists('Multisites') ? HTTP::setGetVar('misdirected', true, $toURL) : $toURL) : Controller::join_links(Director::baseURL(), $toURL);
+
+						// When appropriate, prepend the base URL to match a page redirection.
+
+						$link = self::is_external_URL($toURL) ? (ClassInfo::exists('Multisites') ? HTTP::setGetVar('misdirected', true, $toURL) : $toURL) : ('/' . HTTP::setGetVar('misdirected', true, Controller::join_links(Director::baseURL(), $toURL)));
 						break;
 				}
 				if($link) {
 					return array(
-						'link' => self::is_external_URL($link) ? $link : ('/' . HTTP::setGetVar('misdirected', true, $link)),
+						'link' => $link,
 						'code' => (int)$responseCode
 					);
 				}