bug #146 - br HTML tags showing up in events

diff --git a/include/bbcode.php b/include/bbcode.php
index 86b7fdb4b7027a334855ca63a5d2fd99244bfeed..af6c10c4422daaf77180597cdc7883369e1cb3f4 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -15,6 +15,13 @@ function stripcode_br_cb($s) {
 
 function bbcode($Text,$preserve_nl = false) {
 
+       // If we find any event code, turn it into an event.
+       // After we're finished processing the bbcode we'll 
+       // replace all of the event code with a reformatted version.
+
+       $ev = bbtoevent($Text);
+
+
        // Replace any html brackets with HTML Entities to prevent executing HTML or script
        // Don't use strip_tags here because it breaks [url] search by replacing & with amp
 
@@ -27,11 +34,6 @@ function bbcode($Text,$preserve_nl = false) {
        if($preserve_nl)
                $Text = str_replace(array("\n","\r"), array('',''),$Text);
 
-       // If we find any event code, turn it into an event.
-       // After we're finished processing the bbcode we'll 
-       // replace all of the event code with a reformatted version.
-
-       $ev = bbtoevent($Text);
 
        // Set up the parameters for a URL search string
        $URLSearchString = "^\[\]";