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

no longer need the global using_mb_charset as version 3 is utf-8-only

Browse Source
This commit is contained in:
Marc Delisle
2008-05-25 13:16:31 +00:00
parent 59e00a6f0b
commit 050ba7b6cc
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/string.lib.php
View File

@@ -27,20 +27,7 @@
PMA_dl('mbstring'); PMA_dl('mbstring');
} }
/** $GLOBALS['PMA_allow_mbstr'] = @function_exists('mb_strlen');
* windows-* and tis-620 are not supported and are not multibyte,
* others can be ignored as they're not multibyte
*
* @global boolean $GLOBALS['using_mb_charset']
*/
$GLOBALS['using_mb_charset'] =
substr($GLOBALS['charset'], 0, 8) != 'windows-' &&
substr($GLOBALS['charset'], 0, 9) != 'iso-8859-' &&
substr($GLOBALS['charset'], 0, 3) != 'cp-' &&
$GLOBALS['charset'] != 'koi8-r' &&
$GLOBALS['charset'] != 'tis-620';
$GLOBALS['PMA_allow_mbstr'] = @function_exists('mb_strlen') && $GLOBALS['using_mb_charset'];
if ($GLOBALS['PMA_allow_mbstr']) { if ($GLOBALS['PMA_allow_mbstr']) {
// the hebrew lang file uses iso-8859-8-i, encoded RTL, // the hebrew lang file uses iso-8859-8-i, encoded RTL,

2
main.php
View File

@@ -264,7 +264,7 @@ if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) {
* Nijel: mbstring is used for handling multibyte inside parser, so it is good * Nijel: mbstring is used for handling multibyte inside parser, so it is good
* to tell user something might be broken without it, see bug #1063149. * to tell user something might be broken without it, see bug #1063149.
*/ */
if ($GLOBALS['using_mb_charset'] && !@extension_loaded('mbstring')) { if (! @extension_loaded('mbstring')) {
trigger_error($strMbExtensionMissing, E_USER_WARNING); trigger_error($strMbExtensionMissing, E_USER_WARNING);
} }