Do not add the CORS headers in the install tool (see #8681).

contao · Apr 18, 2017 · 813ac56 · 813ac56
1 parent e404386
commit 813ac56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
 Version 3.5.26 (2017-XX-XX)
 ---------------------------
 
+### Fixed
+Do not add the CORS headers in the install tool (see #8681).
+
 ### Fixed
 Correctly move folders with an "@" in their name (see #8674).
 

diff --git a/system/modules/core/library/Contao/Controller.php b/system/modules/core/library/Contao/Controller.php
@@ -1063,6 +1063,11 @@ public static function redirect($strLocation, $intStatus=303)
 	 */
 	public static function setCorsHeaders()
 	{
+		if (TL_SCRIPT == 'contao/install.php')
+		{
+			return;
+		}
+
 		$strOrigin = \Environment::get('httpOrigin');
 
 		// Not a CORS request