Ticket #891: bbcode.diff

html/inc/text_transform.inc

@@ -122 +122 @@
         "@\[quote\](.*?)\[/quote\]@is",
         "@\[list\](.*?)\[/list\]@is",
         "@\[list=1\](.*?)\[/list\]@is",  
-        "@\[pre\](.*?)\[/pre\]@is",
+        "@\[pre\](.*?)\[/pre\]@eis",
         "@\[img\]$urlregex\[/img\]@is",
         "@\[color=(?:\"?)(.{3,8})(?:\"?)\](.*?)\[/color\]@is",
         "@((?:<ol>|<ul>).*?)\n\*([^\n]+)\n(.*?(</ol>|</ul>))@is",
@@ -153 +153 @@
         "<blockquote class='postbody'>\\1</blockquote>",
         "<ul>\\1</ul><p>",
         "<ol>\\1</ol><p>",
-        "<pre>\\1</pre>",
+        "'<pre>'.remove_br('\\1').'</pre>'",
         "<img src=\"http://\\2\">",
         "<font color=\"\\1\">\\2</font>",
         "\\1<li>\\2\n\\3",
@@ -186 +186 @@
     return str_replace("[", "&#91;", $text);
 }
 
+/**
+ * Removes any <br> tags added by nl2br which are not wanted, for example inside <pre> containers
+ * The original \n was retained after the br when it was added
+ **/
+function remove_br($text){
+    return str_replace("<br />", "", $text);
+}
+
 // Make links open in new windows.
 function externalize_links($text) {
     // TODO:  Convert this to PCRE