From 2fd8a52da94d360b4284cce65991ab198ffaeff7 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sun, 6 Apr 2003 15:24:21 +0000
Subject: [PATCH] Make $HTTP_ACCEPT_LANGUAGE available for machines with
 register_globals = off.

---
 ChangeLog                       |  2 ++
 libraries/grab_globals.lib.php3 | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9728a4bdc..8774fad47 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2003-04-06 Alexander M. Turek  <rabus@users.sourceforge.net>
     * db_datadict.php3: The result of SHOW INDEX does not have a 'Comment'
       column before MySQL 3.23 (bug #712055).
+    * libraries/grab_globals.lib.php3: Make $HTTP_ACCEPT_LANGUAGE available for
+      machines with register_globals = off.
 
 2003-04-05 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/romanian updates, thanks to Valics Lehel
diff --git a/libraries/grab_globals.lib.php3 b/libraries/grab_globals.lib.php3
index c24148862..0dbe2b943 100644
--- a/libraries/grab_globals.lib.php3
+++ b/libraries/grab_globals.lib.php3
@@ -56,10 +56,20 @@ if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
         }
     } // end if
 
-    if (!empty($_SERVER) && isset($_SERVER['PHP_SELF'])) {
-        $PHP_SELF = $_SERVER['PHP_SELF'];
-    } else if (!empty($HTTP_SERVER_VARS) && isset($HTTP_SERVER_VARS['PHP_SELF'])) {
-        $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
+    if (!empty($_SERVER)) {
+        if (isset($_SERVER['PHP_SELF'])) {
+            $PHP_SELF = $_SERVER['PHP_SELF'];
+        }
+        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            $HTTP_ACCEPT_LANGUAGE = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+        }
+    } else if (!empty($HTTP_SERVER_VARS)) {
+        if (isset($HTTP_SERVER_VARS['PHP_SELF'])) {
+            $PHP_SELF = $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'];
+        }
+        if (isset($HTTP_SERVER_VARS['PHP_SELF'])) {
+            $HTTP_ACCEPT_LANGUAGE = $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'];
+        }
     } // end if
 
     // Securety fix: disallow accessing serious server files via "?goto="