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

Fixes for AIX wrapper, thanks to Bj��rn Wiberg - bwiberg.

Browse Source
This commit is contained in:
Michal Čihař
2006-02-22 08:26:32 +00:00
parent 9290eff347
commit 62431c7cc8
3 changed files with 8 additions and 1 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$
2006-02-22 Michal Čihař <michal@cihar.com>
* 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 <cybot_tm@users.sourceforge.net> 2006-02-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/footer.inc.php: * libraries/footer.inc.php:
bug #1436279 Left frame links open in new windows in Safari bug #1436279 Left frame links open in new windows in Safari

2
libraries/charset_conversion.lib.php
View File

@@ -129,7 +129,7 @@ if (isset($cfg['AllowAnywhereRecoding'])
/* Load AIX iconv wrapper if needed */ /* Load AIX iconv wrapper if needed */
if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) { if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) {
require_once('./liraries/iconv_wrapper.lib.php'); require_once('./libraries/iconv_wrapper.lib.php');
} }
/** /**

3
libraries/iconv_wrapper.lib.php
View File

@@ -42,6 +42,9 @@ $gnu_iconv_to_aix_iconv_codepage_map = array (
* @author bwiberg Björn Wiberg <Bjorn.Wiberg@its.uu.se> * @author bwiberg Björn Wiberg <Bjorn.Wiberg@its.uu.se>
*/ */
function PMA_aix_iconv_wrapper($in_charset, $out_charset, $str) { 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 // Check for transliteration argument at the end of output character set name
$translit_search = strpos(strtolower($out_charset), '//translit'); $translit_search = strpos(strtolower($out_charset), '//translit');
$using_translit = (!($translit_search === FALSE)); $using_translit = (!($translit_search === FALSE));