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

Default iconv parameters to empty string, as older iconv version don't support it

Browse Source
This commit is contained in:
Michal Čihař
2003-06-01 21:50:19 +00:00
parent 8ad8361cd0
commit 1d676548dc
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-06-01 Michal Cihar <nijel@users.sourceforge.net>
* config.inc.php3, libraries/config_import.lib.php3: Default iconv
parameters to empty string, as older iconv version don't support it
(bug #747164).
2003-06-01 Alexander M. Turek <rabus@users.sourceforge.net> 2003-06-01 Alexander M. Turek <rabus@users.sourceforge.net>
* lang/catalan-*.inc.php3: Updates, thanks to Xavier Navarro (xavin). * lang/catalan-*.inc.php3: Updates, thanks to Xavier Navarro (xavin).

2
config.inc.php3
View File

@@ -322,7 +322,7 @@ $cfg['RecodingEngine'] = 'auto';
// Specify some parameters for iconv used in charset conversion. See iconv // Specify some parameters for iconv used in charset conversion. See iconv
// documentation for details: // documentation for details:
// http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html // http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
$cfg['IconvExtraParams'] = '//IGNORE'; $cfg['IconvExtraParams'] = '';
// Available charsets for MySQL conversion. currently contains all which could // Available charsets for MySQL conversion. currently contains all which could
// be found in lang/* files and few more. // be found in lang/* files and few more.

2
libraries/config_import.lib.php3
View File

@@ -491,7 +491,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
} }
if (!isset($cfg['IconvExtraParams'])) { if (!isset($cfg['IconvExtraParams'])) {
$cfg['IconvExtraParams'] = '//IGNORE'; $cfg['IconvExtraParams'] = '';
} }
if (!isset($cfg['Lang']) &&isset($cfgLang)) { if (!isset($cfg['Lang']) &&isset($cfgLang)) {