Exit the script if iconv cannot be used.
This commit is contained in:
@@ -8,6 +8,8 @@ $Source$
|
||||
2002-07-18 Alexander M. Turek <rabus@users.sourceforge.net>
|
||||
* libraries/common.lib.php3, libraries/select_lang.lib.php3: Don't include
|
||||
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>
|
||||
* libraries/display_tbl.lib.php3: bug 579785, Edit links URLs too long
|
||||
|
@@ -146,8 +146,12 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
|
||||
} else if (@function_exists('recode_string')) {
|
||||
return recode_string($charset . '..' . $convcharset, $what);
|
||||
} else {
|
||||
if (!isset($GLOBALS['is_header_sent'])) {
|
||||
require('./header.inc.php3');
|
||||
}
|
||||
echo $GLOBALS['strCantUseRecodeIconv'];
|
||||
return $what;
|
||||
require('./footer.inc.php3');
|
||||
exit;
|
||||
}
|
||||
}
|
||||
} // end of the "PMA_convert_charset()" function
|
||||
|
Reference in New Issue
Block a user