(no commit message)

diff --git a/.htaccess b/.htaccess
index c0e6a6ea9b231b86b6086295a71cce70c2f6db94..6c3b5295bc0b80e2e0242530340ff404cc29ba9c 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -11,7 +11,7 @@ AddCharset UTF-8 log
 </IfModule>\r
 \r
 <IfModule mod_headers.c>\r
-       Header set Access-Control-Allow-Origin "*"\r
+       Header merge Access-Control-Allow-Origin "*"\r
 </IfModule>\r
 \r
 <IfModule mod_deflate.c>\r

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index bfe8f74f883f0ec6c73bdd0943ce47a7863949e8..fdc5e3ff813fa796d4a94ae58c74841e516adcd3 100644 (file)
--- 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;