aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-09-25 14:29:05 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-09-25 14:29:05 +0000
commitb4fb7155314320e9e9e8e4b8f0f86478d9c00943 (patch)
treeb73ff61a7ea797e799f6dd1d8de59cbf84103a75 /phpBB/includes/message_parser.php
parentd7b12970d72fdb6b0d211c6bce8ab9f877f5e4fa (diff)
downloadforums-b4fb7155314320e9e9e8e4b8f0f86478d9c00943.tar
forums-b4fb7155314320e9e9e8e4b8f0f86478d9c00943.tar.gz
forums-b4fb7155314320e9e9e8e4b8f0f86478d9c00943.tar.bz2
forums-b4fb7155314320e9e9e8e4b8f0f86478d9c00943.tar.xz
forums-b4fb7155314320e9e9e8e4b8f0f86478d9c00943.zip
fix bbcode in bbcode problem
git-svn-id: file:///svn/phpbb/trunk@5227 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 5d352981e2..d97f2b731d 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -141,7 +141,7 @@ class bbcode_firstpass extends bbcode
function check_bbcode($bbcode, &$in)
{
- $in = trim($in);
+ $in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
if (!$in)
{
@@ -987,7 +987,6 @@ class parse_message extends bbcode_firstpass
return;
}
}
-
$this->message = trim(preg_replace($match, $replace, $this->message));
}
}