Project

General

Profile

« Previous | Next » 

Revision 782

Added by thorn over 16 years ago

fixed charset names (uppercase)

View differences:

trunk/wb/framework/functions-utf8.php
230 230
	$wrong_ISO8859 = false;
231 231
	$converted = false;
232 232

  
233
	if((!function_exists('iconv') && !UTF8_MBSTRING && ($charset_in=='big5' || $charset_in=='iso-2022-jp' || $charset_in=='iso-2022-kr')) || (!function_exists('iconv') && $charset_in=='gb2312')) {
233
	if((!function_exists('iconv') && !UTF8_MBSTRING && ($charset_in=='BIG5' || $charset_in=='ISO-2022-JP' || $charset_in=='ISO-2022-KR')) || (!function_exists('iconv') && $charset_in=='GB2312')) {
234 234
		// Nothing we can do here :-(
235 235
		// Charset is one of those obscure ISO-2022... or BIG5, GB2312 or something
236 236
		// and we can't use mb_convert_encoding() or iconv();
......
318 318
	$wrong_ISO8859 = false;
319 319
	$converted = false;
320 320

  
321
	if((!function_exists('iconv') && !UTF8_MBSTRING && ($charset_out=='big5' || $charset_out=='iso-2022-jp' || $charset_out=='iso-2022-kr')) || (!function_exists('iconv') && $charset_out=='gb2312')) {
321
	if((!function_exists('iconv') && !UTF8_MBSTRING && ($charset_out=='BIG5' || $charset_out=='ISO-2022-JP' || $charset_out=='ISO-2022-KR')) || (!function_exists('iconv') && $charset_out=='GB2312')) {
322 322
		// Nothing we can do here :-(
323 323
		// Charset is one of those obscure ISO-2022... or BIG5, GB2312 or something
324 324
		// and we can't use mb_convert_encoding() or iconv();

Also available in: Unified diff