git-svn-id: file:///svn/phpbb/trunk@6852 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-01-07 14:24:01 +00:00
parent 3c352ba4ef
commit 8f0f2e1f0d
2 changed files with 4 additions and 4 deletions

View file

@ -406,7 +406,7 @@ function iso_8859_7($string)
return strtr($string, $transform); return strtr($string, $transform);
} }
function iso_8895_9($string) function iso_8859_9($string)
{ {
static $tranform = array( static $tranform = array(
"\xC3\x90" => "\xC4\x9E", "\xC3\x90" => "\xC4\x9E",
@ -419,7 +419,7 @@ function iso_8895_9($string)
return strtr(utf8_encode($string), $transform); return strtr(utf8_encode($string), $transform);
} }
function iso_8895_15($string) function iso_8859_15($string)
{ {
static $tranform = array( static $tranform = array(
"\xC2\xA4" => "\xE2\x82\xAC", "\xC2\xA4" => "\xE2\x82\xAC",

View file

@ -767,7 +767,7 @@ function utf8_recode($string, $encoding)
case '7': case '7':
case '9': case '9':
case '15': case '15':
if (!function_exists('iso_8895_' . $array[1])) if (!function_exists('iso_8859_' . $array[1]))
{ {
if (!file_exists($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx)) if (!file_exists($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx))
{ {
@ -775,7 +775,7 @@ function utf8_recode($string, $encoding)
} }
include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx); include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx);
} }
return call_user_func('iso_8895_' . $array[1], $string); return call_user_func('iso_8859_' . $array[1], $string);
break; break;
default: default: