diff --git a/index.php b/index.php index d0bb191b9..ca31e2419 100644 --- a/index.php +++ b/index.php @@ -42,7 +42,6 @@ require_once './libraries/relation.lib.php'; session_write_close(); // Gets the host name -// loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+ if (empty($HTTP_HOST)) { if (PMA_getenv('HTTP_HOST')) { $HTTP_HOST = PMA_getenv('HTTP_HOST'); diff --git a/libraries/File.class.php b/libraries/File.class.php index 56a81b1f2..b8ddaaef1 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -342,14 +342,9 @@ class PMA_File 'type' => $file['type']['multi_edit'][$primary], 'size' => $file['size']['multi_edit'][$primary], 'tmp_name' => $file['tmp_name']['multi_edit'][$primary], - //'error' => $file['error']['multi_edit'][$primary], + 'error' => $file['error']['multi_edit'][$primary], ); - // ['error'] exists since PHP 4.2.0 - if (isset($file['error'])) { - $new_file['error'] = $file['error']['multi_edit'][$primary]; - } - return $new_file; } diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index 4b98aa7a1..ea9a9ac46 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -99,7 +99,6 @@ function PMA_auth_check() // Grabs the $PHP_AUTH_USER variable whatever are the values of the // 'register_globals' and the 'variables_order' directives - // loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+ if (empty($PHP_AUTH_USER)) { if (PMA_getenv('PHP_AUTH_USER')) { $PHP_AUTH_USER = PMA_getenv('PHP_AUTH_USER'); @@ -122,7 +121,6 @@ function PMA_auth_check() } // Grabs the $PHP_AUTH_PW variable whatever are the values of the // 'register_globals' and the 'variables_order' directives - // loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+ if (empty($PHP_AUTH_PW)) { if (PMA_getenv('PHP_AUTH_PW')) { $PHP_AUTH_PW = PMA_getenv('PHP_AUTH_PW'); diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index 76eefad04..49011d968 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -6,8 +6,6 @@ * the same work for the $PHP_SELF, $HTTP_ACCEPT_LANGUAGE and * $HTTP_AUTHORIZATION variables. * - * loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+ - * * @version $Id$ */ diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 205ea26be..2f03b2601 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -170,7 +170,6 @@ function PMA_allowDeny($type) } // Handle shortcuts with above array - // DON'T use "array_key_exists" as it's only PHP 4.1 and newer. if (isset($shortcuts[$rule_data[2]])) { $rule_data[2] = $shortcuts[$rule_data[2]]; }