From 62431c7cc80b650f379b41775033c1081d8669c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 22 Feb 2006 08:26:32 +0000 Subject: [PATCH] =?UTF-8?q?Fixes=20for=20AIX=20wrapper,=20thanks=20to=20Bj?= =?UTF-8?q?=EF=BF=BD=EF=BF=BDrn=20Wiberg=20-=20bwiberg.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 4 ++++ libraries/charset_conversion.lib.php | 2 +- libraries/iconv_wrapper.lib.php | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cbf145231..49baf76f0 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2006-02-22 Michal Čihař + * libraries/iconv_wrapper.lib.php, libraries/charset_conversion.lib.php: + Fixes for AIX wrapper, thanks to Björn Wiberg - bwiberg. + 2006-02-22 Sebastian Mendel * libraries/footer.inc.php: bug #1436279 Left frame links open in new windows in Safari diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 870fd12d9..b4b88415e 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -129,7 +129,7 @@ if (isset($cfg['AllowAnywhereRecoding']) /* Load AIX iconv wrapper if needed */ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) { - require_once('./liraries/iconv_wrapper.lib.php'); + require_once('./libraries/iconv_wrapper.lib.php'); } /** diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php index d5fd04aca..c33d7a7ed 100644 --- a/libraries/iconv_wrapper.lib.php +++ b/libraries/iconv_wrapper.lib.php @@ -42,6 +42,9 @@ $gnu_iconv_to_aix_iconv_codepage_map = array ( * @author bwiberg Björn Wiberg */ function PMA_aix_iconv_wrapper($in_charset, $out_charset, $str) { + + global $gnu_iconv_to_aix_iconv_codepage_map; + // Check for transliteration argument at the end of output character set name $translit_search = strpos(strtolower($out_charset), '//translit'); $using_translit = (!($translit_search === FALSE));