diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-02-20 13:57:52 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-02-20 13:57:52 +0000 |
| commit | af4c99690be6e6d21c096441d2e0a1283d054d06 (patch) | |
| tree | 7a663f913f8bfcd2e8966806941f675a340164b1 /phpBB/install/convertors/functions_phpbb20.php | |
| parent | 66b18be324deca4d392ee51f8b73a6d65b75eacc (diff) | |
| download | forums-af4c99690be6e6d21c096441d2e0a1283d054d06.tar forums-af4c99690be6e6d21c096441d2e0a1283d054d06.tar.gz forums-af4c99690be6e6d21c096441d2e0a1283d054d06.tar.bz2 forums-af4c99690be6e6d21c096441d2e0a1283d054d06.tar.xz forums-af4c99690be6e6d21c096441d2e0a1283d054d06.zip | |
#8242
#7976
git-svn-id: file:///svn/phpbb/trunk@7021 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/convertors/functions_phpbb20.php')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 0b05f4308d..8f6328a928 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -89,7 +89,7 @@ function phpbb_insert_forums() { $sql_ary = array( 'forum_id' => $max_forum_id, - 'forum_name' => ($row['cat_title']) ? htmlspecialchars(phpbb_set_encoding($row['cat_title'], false), ENT_COMPAT, 'UTF-8') : $user->lang['CATEGORY'], + 'forum_name' => ($row['cat_title']) ? htmlspecialchars(phpbb_set_default_encoding($row['cat_title']), ENT_COMPAT, 'UTF-8') : $user->lang['CATEGORY'], 'parent_id' => 0, 'forum_parents' => '', 'forum_desc' => '', @@ -200,10 +200,10 @@ function phpbb_insert_forums() // Define the new forums sql ary $sql_ary = array( 'forum_id' => (int) $row['forum_id'], - 'forum_name' => htmlspecialchars(phpbb_set_encoding($row['forum_name'], false), ENT_COMPAT, 'UTF-8'), + 'forum_name' => htmlspecialchars(phpbb_set_default_encoding($row['forum_name']), ENT_COMPAT, 'UTF-8'), 'parent_id' => $cats_added[$row['cat_id']], 'forum_parents' => '', - 'forum_desc' => htmlspecialchars(phpbb_set_encoding($row['forum_desc'], false), ENT_COMPAT, 'UTF-8'), + 'forum_desc' => htmlspecialchars(phpbb_set_default_encoding($row['forum_desc']), ENT_COMPAT, 'UTF-8'), 'forum_type' => FORUM_POST, 'forum_status' => is_item_locked($row['forum_status']), 'enable_prune' => $row['prune_enable'], @@ -1047,7 +1047,7 @@ function phpbb_convert_group_name($group_name) return 'phpBB2 - ' . $group_name; } - return phpbb_set_encoding($group_name, false); + return phpbb_set_default_encoding($group_name); } /** |