aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/utf
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-01-07 14:24:01 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-01-07 14:24:01 +0000
commit8f0f2e1f0d71c9f71c823734200e490e69338869 (patch)
tree15d6613e0b2ec5050ca041e341f00a6d2825ca2d /phpBB/includes/utf
parent3c352ba4efc4d6bdb805ff4c7a1ff757c27ee294 (diff)
downloadforums-8f0f2e1f0d71c9f71c823734200e490e69338869.tar
forums-8f0f2e1f0d71c9f71c823734200e490e69338869.tar.gz
forums-8f0f2e1f0d71c9f71c823734200e490e69338869.tar.bz2
forums-8f0f2e1f0d71c9f71c823734200e490e69338869.tar.xz
forums-8f0f2e1f0d71c9f71c823734200e490e69338869.zip
#6828
git-svn-id: file:///svn/phpbb/trunk@6852 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/utf')
-rw-r--r--phpBB/includes/utf/data/recode_basic.php4
-rw-r--r--phpBB/includes/utf/utf_tools.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/utf/data/recode_basic.php b/phpBB/includes/utf/data/recode_basic.php
index 1a9d7af745..8950b0550b 100644
--- a/phpBB/includes/utf/data/recode_basic.php
+++ b/phpBB/includes/utf/data/recode_basic.php
@@ -406,7 +406,7 @@ function iso_8859_7($string)
return strtr($string, $transform);
}
-function iso_8895_9($string)
+function iso_8859_9($string)
{
static $tranform = array(
"\xC3\x90" => "\xC4\x9E",
@@ -419,7 +419,7 @@ function iso_8895_9($string)
return strtr(utf8_encode($string), $transform);
}
-function iso_8895_15($string)
+function iso_8859_15($string)
{
static $tranform = array(
"\xC2\xA4" => "\xE2\x82\xAC",
diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php
index ec233cf986..3a95c5f35f 100644
--- a/phpBB/includes/utf/utf_tools.php
+++ b/phpBB/includes/utf/utf_tools.php
@@ -767,7 +767,7 @@ function utf8_recode($string, $encoding)
case '7':
case '9':
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))
{
@@ -775,7 +775,7 @@ function utf8_recode($string, $encoding)
}
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;
default: