Changeset 1647 in ExiteCMS for trunk/includes/forum_functions_include.php

Timestamp:

08/17/08 14:48:04 (4 years ago)

Author:

hverton

Message:

fixed incorrectly parsing [img] tags

File:

• trunk/includes/forum_functions_include.php (modified) (2 diffs)

trunk/includes/forum_functions_include.php

@@ -447 +447 @@
     $rawmsg = preg_replace_callback('#\[url(=.*?)\](.*?)([\r\n]*)\[/url\]#si', '_parseubb_urlblock', $rawmsg);
 
+    // strip IMG bbcode
+    $rawmsg = preg_replace_callback('#\[img\](.*?)([\r\n]*)\[/img\]#si', '_parseubb_imgblock', $rawmsg);
+
     // find other URL's in the text, strip them and add them to $urlblocks for conversion to [URL] bbcodes
     $rawmsg = preg_replace_callback('#(http|https|ftp)\://([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*@)?((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|(localhost)|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.[a-zA-Z]{2,4})(\:[0-9]+)?(/[^/][a-zA-Z0-9\.\,\?\'\\/\+&%\$\#\:\*\=~_\-@]*)*#si', '_parseubb_texturls', $rawmsg);
@@ -452 +455 @@
     // convert any newlines to html <br>
     $rawmsg = nl2br($rawmsg);
-
-    // strip IMG bbcode
-    $rawmsg = preg_replace_callback('#\[img\](.*?)([\r\n]*)\[/img\]#si', '_parseubb_imgblock', $rawmsg);
 
     // detect and convert wikitags to wiki bbcodes if needed