From dc19da263165744f508922b3a4843e3ad2c8c083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= Date: Fri, 15 Feb 2002 12:43:41 +0000 Subject: [PATCH] bug #516491 - in php 4.1+ --- ChangeLog | 2 ++ libraries/defines.lib.php3 | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index a284f6e2e..d3951485e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ $Source$ * libraries/select_lang.php3: sorted the languages array. * libraries/auth/cookie.auth.lib.php3, line 100: restored the use of "$strLogin" inside the title of the login page. + * libraries/defines.inc.php3: bug #516491 - $HTTP_USER_AGENT in + php 4.1+. Thanks to Marcus Börger for this patch. 2002-02-14 Marc Delisle * hungarian updates thanks to Peter Bakondy diff --git a/libraries/defines.lib.php3 b/libraries/defines.lib.php3 index 1c3661b01..fe21771a0 100644 --- a/libraries/defines.lib.php3 +++ b/libraries/defines.lib.php3 @@ -89,7 +89,10 @@ if (!defined('PMA_USR_OS')) { $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT']; } else if (!empty($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) { $HTTP_USER_AGENT = $HTTP_SERVER_VARS['HTTP_USER_AGENT']; + } else if (!isset($HTTP_USER_AGENT)) { + $HTTP_USER_AGENT = ''; } + // 1. Platform if (strstr($HTTP_USER_AGENT, 'Win')) { define('PMA_USR_OS', 'Win'); @@ -104,6 +107,7 @@ if (!defined('PMA_USR_OS')) { } else { define('PMA_USR_OS', 'Other'); } + // 2. browser and version if (ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) { define('PMA_USR_BROWSER_VER', $log_version[1]);