From a3371cef51b933f529d37faaaefae39d160e945d Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Sat, 6 Jul 2002 21:23:28 +0000 Subject: [PATCH] $GLOBALS[] --- ChangeLog | 4 ++++ libraries/charset_conversion.lib.php3 | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38d33b6bd..b66506ad4 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-07-06 Alexander M. Turek + * charset_conversion.lib.php3: $strCantUseRecodeIconv has to be accessed via + the $GLOBALS[] array. + 2002-07-06 Marc Delisle * tbl_properties_structure.php3: undefined variable * pdf_pages.php3: bug 574637 undefined index diff --git a/libraries/charset_conversion.lib.php3 b/libraries/charset_conversion.lib.php3 index d1a069046..0a790691b 100644 --- a/libraries/charset_conversion.lib.php3 +++ b/libraries/charset_conversion.lib.php3 @@ -87,7 +87,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){ } else if (@function_exists('recode_string')) { return recode_string($convcharset . '..' . $charset, $what); } else { - echo $strCantUseRecodeIconv; + echo $GLOBALS['strCantUseRecodeIconv']; return $what; } } @@ -142,7 +142,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){ } else if (@function_exists('recode_string')) { return recode_string($charset . '..' . $convcharset, $what); } else { - echo $strCantUseRecodeIconv; + echo $GLOBALS['strCantUseRecodeIconv']; return $what; } }