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

Exit the script if iconv cannot be used.

Browse Source
This commit is contained in:
Alexander M. Turek
2002-07-18 22:58:42 +00:00
parent e2b2560a98
commit 0f629f73dc
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2002-07-18 Alexander M. Turek <rabus@users.sourceforge.net> 2002-07-18 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/common.lib.php3, libraries/select_lang.lib.php3: Don't include * libraries/common.lib.php3, libraries/select_lang.lib.php3: Don't include
the "real" config file if a developer edition exists. the "real" config file if a developer edition exists.
* libraries/charset_conversion.lib.php3: Exit the script if iconv cannot be
used.
2002-07-18 Marc Delisle <lem9@users.sourceforge.net> 2002-07-18 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php3: bug 579785, Edit links URLs too long * libraries/display_tbl.lib.php3: bug 579785, Edit links URLs too long

6
libraries/charset_conversion.lib.php3
View File

@@ -146,8 +146,12 @@ 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 {
if (!isset($GLOBALS['is_header_sent'])) {
require('./header.inc.php3');
}
echo $GLOBALS['strCantUseRecodeIconv']; echo $GLOBALS['strCantUseRecodeIconv'];
return $what; require('./footer.inc.php3');
exit;
} }
} }
} // end of the "PMA_convert_charset()" function } // end of the "PMA_convert_charset()" function