aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/convertors/functions_phpbb20.php
diff options
context:
space:
mode:
authorRichard Foote <dicky@phpbb.com>2010-07-24 11:47:36 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-24 11:48:47 +0200
commit66fc086742d052cada3e582f6a08ca48bd0b0714 (patch)
tree80aa66d0a382e2a526d26123e19151dfa6a3ee2a /phpBB/install/convertors/functions_phpbb20.php
parentfc25fe694afdab683789c9ed962c77558f85796c (diff)
downloadforums-66fc086742d052cada3e582f6a08ca48bd0b0714.tar
forums-66fc086742d052cada3e582f6a08ca48bd0b0714.tar.gz
forums-66fc086742d052cada3e582f6a08ca48bd0b0714.tar.bz2
forums-66fc086742d052cada3e582f6a08ca48bd0b0714.tar.xz
forums-66fc086742d052cada3e582f6a08ca48bd0b0714.zip
[ticket/9748] Replace <br /> before converting < and > to their entities.
PHPBB3-9748
Diffstat (limited to 'phpBB/install/convertors/functions_phpbb20.php')
-rw-r--r--phpBB/install/convertors/functions_phpbb20.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index b80c7673e3..78224dd5da 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1239,9 +1239,9 @@ function phpbb_prepare_message($message)
// Already the new user id ;)
$user_id = $convert->row['poster_id'];
+ $message = str_replace('<br />', "\n", $message);
$message = str_replace('<', '&lt;', $message);
$message = str_replace('>', '&gt;', $message);
- $message = str_replace('<br />', "\n", $message);
// make the post UTF-8
$message = phpbb_set_encoding($message);