From 1d33bd372bfd41591d32f04e68473cba3c061627 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 5 Oct 2005 13:19:46 +0000 Subject: [PATCH] undefined constant at login time --- ChangeLog | 2 ++ libraries/charset_conversion.lib.php | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c11fea4b2..e177451f3 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ $Source$ MySQL 5.0.13 views * libraries/display_tbl.lib.php: bug #1306833, full text link broken, thanks to Vernon Lyon - vlyon + * libraries/charset_conversion.lib.php: PMA_MYSQL_INT_VERSION is not + defined at login time but what tested 2005-10-04 Sebastian Mendel * libraries/functions.js, libraries/sql_query_form.lib.php: diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 7a8fd43fb..000c98101 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -140,7 +140,8 @@ function PMA_convert_display_charset($what) { if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding) || $convcharset == $charset // rabus: if input and output charset are the same, we don't have to do anything... - || PMA_MYSQL_INT_VERSION >= 40100 ) { // lem9: even if AllowAnywhereRecoding is TRUE, do not recode for MySQL >= 4.1.x since MySQL does the job + // this constant is not defined before the login: + || (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION >= 40100) ) { // lem9: even if AllowAnywhereRecoding is TRUE, do not recode for MySQL >= 4.1.x since MySQL does the job return $what; } else if (is_array($what)) {