diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-09-12 14:59:59 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-09-12 14:59:59 +0200 |
| commit | 161be96c661651edad16ccfd946c530626c8aacb (patch) | |
| tree | ff31bc0a23f683bd686b3497feb6b8b66c4016e3 /phpBB | |
| parent | e08395745ba8d69e5d523563a03fe27e903dba27 (diff) | |
| parent | 66fc086742d052cada3e582f6a08ca48bd0b0714 (diff) | |
| download | forums-161be96c661651edad16ccfd946c530626c8aacb.tar forums-161be96c661651edad16ccfd946c530626c8aacb.tar.gz forums-161be96c661651edad16ccfd946c530626c8aacb.tar.bz2 forums-161be96c661651edad16ccfd946c530626c8aacb.tar.xz forums-161be96c661651edad16ccfd946c530626c8aacb.zip | |
Merge branch 'ticket/bantu/9748' into develop-olympus
* ticket/bantu/9748:
[ticket/9748] Replace <br /> before converting < and > to their entities.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 2 |
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('<', '<', $message); $message = str_replace('>', '>', $message); - $message = str_replace('<br />', "\n", $message); // make the post UTF-8 $message = phpbb_set_encoding($message); |