aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/html2bbcode.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index c1c1f972f..c00df8f23 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -193,7 +193,7 @@ function html2bbcode($message)
node2bbcode($doc, 'blockquote', array(), '[quote]', '[/quote]');
// Use a temporary tag to keep line breaks
- node2bbcode($doc, 'br', array(), '[br] ', '');
+ node2bbcode($doc, 'br', array(), '[br]', '');
node2bbcode($doc, 'a', array('href'=>'/(.+)/'), '[url=$1]', '[/url]');
@@ -304,7 +304,7 @@ function html2bbcode($message)
array('[b]', '[/b]', '[i]', '[/i]'), $message);
// Restore linebreaks from temp tag
- $message = str_replace('[br] ', "\n", $message);
+ $message = preg_replace('/\[br\]\s{1}|\[br\]/', "\n", $message);
// Handling Yahoo style of mails
// $message = str_replace('[hr][b]From:[/b]', '[quote][b]From:[/b]', $message);