aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-03-02 15:52:46 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-03-02 15:52:46 +0000
commit87cce70d108c619026d04be1daad01071f325327 (patch)
tree509cf2e7148ceb82ac252f339b603b5d52e7b589 /phpBB/includes/message_parser.php
parentbeb17ef6f27d06e1001ee243e6b69b4cc0332aaf (diff)
downloadforums-87cce70d108c619026d04be1daad01071f325327.tar
forums-87cce70d108c619026d04be1daad01071f325327.tar.gz
forums-87cce70d108c619026d04be1daad01071f325327.tar.bz2
forums-87cce70d108c619026d04be1daad01071f325327.tar.xz
forums-87cce70d108c619026d04be1daad01071f325327.zip
changed back to nl2br (nl2br in PHP >= 4.0.5 is XHTML compatible)
git-svn-id: file:///svn/phpbb/trunk@3584 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index afaed8cb82..d7fe7dd6fc 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -207,7 +207,7 @@ class parse_message
$message = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$censors['match'], \$censors['replace'], '\\0')", '>' . $message . '<'), 1, -1));
}
- $message = str_replace("\n", "<br />", $message);
+ $message = nl2br($message);
/* Signature
$user_sig = ($sig && $signature != '' && $config['allow_sig']) ? $row['user_sig'] : '';