nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

$GLOBALS[]

Browse Source
This commit is contained in:
Alexander M. Turek
2002-07-06 21:23:28 +00:00
parent a8b03f86a1
commit a3371cef51
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-07-06 Alexander M. Turek <rabus@users.sourceforge.net>
* charset_conversion.lib.php3: $strCantUseRecodeIconv has to be accessed via
the $GLOBALS[] array.
2002-07-06 Marc Delisle <lem9@users.sourceforge.net> 2002-07-06 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties_structure.php3: undefined variable * tbl_properties_structure.php3: undefined variable
* pdf_pages.php3: bug 574637 undefined index * pdf_pages.php3: bug 574637 undefined index

4
libraries/charset_conversion.lib.php3
View File

@@ -87,7 +87,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
} else if (@function_exists('recode_string')) { } else if (@function_exists('recode_string')) {
return recode_string($convcharset . '..' . $charset, $what); return recode_string($convcharset . '..' . $charset, $what);
} else { } else {
echo $strCantUseRecodeIconv; echo $GLOBALS['strCantUseRecodeIconv'];
return $what; return $what;
} }
} }
@@ -142,7 +142,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
} else if (@function_exists('recode_string')) { } else if (@function_exists('recode_string')) {
return recode_string($charset . '..' . $convcharset, $what); return recode_string($charset . '..' . $convcharset, $what);
} else { } else {
echo $strCantUseRecodeIconv; echo $GLOBALS['strCantUseRecodeIconv'];
return $what; return $what;
} }
} }