[Regression] Keep B/C in the redirect plugin (joomla#17124)

* keep B/C in the redirect plugin * drone * grammar (#28)
zero-24 · Jul 17, 2017 · 11432b5 · 11432b5
1 parent 48f58a6
commit 11432b5
Showing 1 changed file with 28 additions and 5 deletions.
diff --git a/plugins/system/redirect/redirect.php b/plugins/system/redirect/redirect.php
@@ -119,10 +119,16 @@ private static function doErrorHandling($error)
 
 		$uri = JUri::getInstance();
 
-		$url = StringHelper::strtolower(rawurldecode($uri->toString(array('scheme', 'host', 'port', 'path', 'query', 'fragment'))));
-		$urlRel = StringHelper::strtolower(rawurldecode($uri->toString(array('path', 'query', 'fragment'))));
-
-		$urlWithoutQuery = StringHelper::strtolower(rawurldecode($uri->toString(array('scheme', 'host', 'port', 'path', 'fragment'))));
+		// These are the original URLs
+		$orgurl                = rawurldecode($uri->toString(array('scheme', 'host', 'port', 'path', 'query', 'fragment')));
+		$orgurlRel             = rawurldecode($uri->toString(array('path', 'query', 'fragment')));
+		$orgurlWithoutQuery    = rawurldecode($uri->toString(array('scheme', 'host', 'port', 'path', 'fragment')));
+		$orgurlRelWithoutQuery = rawurldecode($uri->toString(array('path', 'fragment')));
+
+		// These are the URLs we save and use
+		$url                = StringHelper::strtolower(rawurldecode($uri->toString(array('scheme', 'host', 'port', 'path', 'query', 'fragment'))));
+		$urlRel             = StringHelper::strtolower(rawurldecode($uri->toString(array('path', 'query', 'fragment'))));
+		$urlWithoutQuery    = StringHelper::strtolower(rawurldecode($uri->toString(array('scheme', 'host', 'port', 'path', 'fragment'))));
 		$urlRelWithoutQuery = StringHelper::strtolower(rawurldecode($uri->toString(array('path', 'fragment'))));
 
 		// Why is this (still) here?
@@ -146,6 +152,14 @@ private static function doErrorHandling($error)
 				. $db->quoteName('old_url') . ' = ' . $db->quote($urlWithoutQuery)
 				. ' OR '
 				. $db->quoteName('old_url') . ' = ' . $db->quote($urlRelWithoutQuery)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($orgurl)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($orgurlRel)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($orgurlWithoutQuery)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($orgurlRelWithoutQuery)
 				. ')'
 			);
 
@@ -163,7 +177,16 @@ private static function doErrorHandling($error)
 		}
 
 		$possibleMatches = array_unique(
-			array($url, $urlRel, $urlWithoutQuery, $urlRelWithoutQuery)
+			array(
+				$url,
+				$urlRel,
+				$urlWithoutQuery,
+				$urlRelWithoutQuery,
+				$orgurl,
+				$orgurlRel,
+				$orgurlWithoutQuery,
+				$orgurlRelWithoutQuery,
+			)
 		);
 
 		foreach ($possibleMatches as $match)