From ec0013dbf6916e08ecdda186106ff9d82dd15b5d Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Fri, 18 Nov 2005 13:02:36 +0000
Subject: [PATCH] - common.lib.php should REALLY REALLY and ALWAYS be the first
 include - no other calls to grab_gloabls.lib.php

---
 ChangeLog                              | 1 +
 css/phpmyadmin.css.php                 | 1 -
 index.php                              | 1 -
 libraries/common.lib.php               | 1 -
 libraries/select_lang.lib.php          | 7 -------
 libraries/select_theme.lib.php         | 1 -
 libraries/transformations/overview.php | 1 -
 7 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45120108d..67e27d56f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ $Source$
       - do not truncate rowcount and next autoindex
     * /*
       - common.lib.php should REALLY REALLY and ALWAYS be the first include
+      - no other calls to grab_gloabls.lib.php
 
 2005-11-17 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: patch #1353283, thanks to Isaac Bennetch
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index f540b9d0a..aed7559c1 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -4,7 +4,6 @@
 
 chdir('..');
 $is_minimum_common = TRUE;
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 require_once('./libraries/sqlparser.lib.php');
 
diff --git a/index.php b/index.php
index 73d7da345..f7a0a1d13 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,6 @@
 /**
  * forms frameset
  * 
- * @uses    libraries/grab_globals.lib.php  import variables
  * @uses    libraries/common.lib.php        global fnctions
  * @uses    libraries/select_theme.lib.php  theme manager
  * @uses    libraries/relation.lib.php      table relations
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 10248c776..b1d398dc9 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -48,7 +48,6 @@
  */
 
 // grab_globals.lib.php should really go before common.lib.php
-// TODO: remove direct calling from elsewhere
 require_once('./libraries/grab_globals.lib.php');
 
 /**
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 0fa948b5a..9a4b258c8 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -7,13 +7,6 @@
  * phpMyAdmin Language Loading File
  */
 
-
-/**
- * We need some elements of the superglobal $_SERVER array.
- */
-require_once('./libraries/grab_globals.lib.php');
-
-
 /**
  * Define the path to the translations directory and get some variables
  * from system arrays if 'register_globals' is set to 'off'
diff --git a/libraries/select_theme.lib.php b/libraries/select_theme.lib.php
index a195cf220..267242ac5 100644
--- a/libraries/select_theme.lib.php
+++ b/libraries/select_theme.lib.php
@@ -31,7 +31,6 @@
 /**
  * We need some elements of the superglobal $_SERVER array.
  */
-require_once('./libraries/grab_globals.lib.php');
 global $PHP_SELF;
 /**
  * theme manager
diff --git a/libraries/transformations/overview.php b/libraries/transformations/overview.php
index 87d3ce611..73b6983aa 100644
--- a/libraries/transformations/overview.php
+++ b/libraries/transformations/overview.php
@@ -16,7 +16,6 @@ define('PMA_DISPLAY_HEADING', 0);
 /**
  * Gets some core libraries and displays a top message if required
  */
-require_once('./libraries/grab_globals.lib.php');
 require_once('./libraries/common.lib.php');
 require_once('./header.inc.php');
 require_once('./libraries/relation.lib.php');