Correctly reload or redirect upon Ajax requests (see #5647)

contao/library/Contao/System.php

@@ -213,16 +213,13 @@ public static function reload()
 		// Ajax request
 		if (\Environment::get('isAjaxRequest'))
 		{
-			echo $strLocation;
-			exit;
+			echo '<script>location.replace("' . $strLocation . '")</script>';
 		}
-
-		if (headers_sent())
+		elseif (!headers_sent())
 		{
-			exit;
+			header('Location: ' . $strLocation);
 		}
 
-		header('Location: ' . $strLocation);
 		exit;
 	}
 
@@ -240,39 +237,42 @@ public static function redirect($strLocation, $intStatus=303)
 		// Ajax request
 		if (\Environment::get('isAjaxRequest'))
 		{
-			echo $strLocation;
-			exit;
-		}
-
-		if (headers_sent())
-		{
-			exit;
+			if (preg_match('@^https?://@i', $strLocation))
+			{
+				echo '<script>location.replace("' . $strLocation . '")</script>';
+			}
+			else
+			{
+				echo '<script>location.replace("' . \Environment::get('base') . $strLocation . '")</script>';
+			}
 		}
-
-		// Header
-		switch ($intStatus)
+		elseif (!headers_sent())
 		{
-			case 301:
-				header('HTTP/1.1 301 Moved Permanently');
-				break;
+			// Header
+			switch ($intStatus)
+			{
+				case 301:
+					header('HTTP/1.1 301 Moved Permanently');
+					break;
 
-			case 302:
-				header('HTTP/1.1 302 Found');
-				break;
+				case 302:
+					header('HTTP/1.1 302 Found');
+					break;
 
-			case 303:
-				header('HTTP/1.1 303 See Other');
-				break;
-		}
+				case 303:
+					header('HTTP/1.1 303 See Other');
+					break;
+			}
 
-		// Check the target address
-		if (preg_match('@^https?://@i', $strLocation))
-		{
-			header('Location: ' . $strLocation);
-		}
-		else
-		{
-			header('Location: ' . \Environment::get('base') . $strLocation);
+			// Check the target address
+			if (preg_match('@^https?://@i', $strLocation))
+			{
+				header('Location: ' . $strLocation);
+			}
+			else
+			{
+				header('Location: ' . \Environment::get('base') . $strLocation);
+			}
 		}
 
 		exit;