Moved fixes to trunk

[gosa.git] / include / accept-to-gettext.inc

diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index abf6b60c1c64b8f3a3bc779de7229101f9bafc17..7d39ecf934ca6253037335eb8bf4d51835e8c96f 100644 (file)
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -90,6 +90,9 @@ function al2gt($gettextlangs, $mime)
   if(!isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])){
     $_SERVER["HTTP_ACCEPT_LANGUAGE"] = "";
   }
+  if(!isset($_SERVER["HTTP_ACCEPT_CHARSET"])){
+    $_SERVER["HTTP_ACCEPT_CHARSET"] = "";
+  }
 
   /* default to "everything is acceptable", as RFC2616 specifies */
   $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
@@ -164,9 +167,10 @@ function al2gt($gettextlangs, $mime)
     if(!isset($alscores[$noct[0]])){
       $alscores[$noct[0]] = "";
     }
+  
     if(!isset($acscores[$gtcs])){
       $acscores[$gtcs] = "";
-    } 
+    }
     $testvals=array(
         array($alscores[$allang], $acscores[$gtcs]),
         array($alscores[$noct[0]], $acscores[$gtcs]),