From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 23 Jun 2014 12:14:54 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d0fa515f3ed5d821ec7dcc1d07b406ab82f25a96;p=cubeextranet.git

---

diff --git a/.htaccess b/.htaccess
index c0e6a6ea9..6c3b5295b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -11,7 +11,7 @@ AddCharset UTF-8 log
 </IfModule>
 
 <IfModule mod_headers.c>
-	Header set Access-Control-Allow-Origin "*"
+	Header merge Access-Control-Allow-Origin "*"
 </IfModule>
 
 <IfModule mod_deflate.c>
diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index bfe8f74f8..fdc5e3ff8 100644
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -517,8 +517,8 @@ class commonTools {
 	public static function getDefaultLanguage() {
 		$available = explode(',', $_GET['available']);
 		header('Content-type: text/plain');
-		header('Access-Control-Allow-Origin: *');
-		header('Access-Control-Allow-Methods: GET');
+		header('Access-Control-Allow-Origin: *', true);
+		header('Access-Control-Allow-Methods: GET', true);
 		ob_end_clean();
 		echo cubeLang::getBrowserLang($available, true);
 		exit;