mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/9754] Populate S_USER_POSTED variable with correct value in search.php
  [ticket/9748] Replace <br /> before converting < and > to their entities.
  [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
This commit is contained in:
Igor Wiedler
2010-09-12 15:01:17 +02:00
parent c0d645c319 161be96c66
commit 3e8d45910d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/install/convertors/functions_phpbb20.php
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);