Merge branch 'ticket/bantu/9748' into develop-olympus

* ticket/bantu/9748:
  [ticket/9748] Replace <br /> before converting < and > to their entities.
This commit is contained in:
Igor Wiedler 2010-09-12 14:59:59 +02:00
commit 161be96c66

View file

@ -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);