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

Timestamp:

07/28/08 11:07:59 (4 years ago)

Author:

root

Message:

Filter [img] tags in parsemessage() before checking for wiki links, to avoid image link corruption

File:

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

trunk/includes/forum_functions_include.php

@@ -393 +393 @@
 // message parser, strip [code], [img] and [url] sections, parse for BBcode, smiley's, then insert the sections again
 function parsemessage($msg_array) {
-    global $settings, $db_prefix, $codeblocks, $urlblocks, $current_message;
+    global $settings, $db_prefix, $codeblocks, $urlblocks, $imgblocks, $current_message;
 
     // validate the parameters
@@ -409 +409 @@
     $imgblocks = array();
 
-    // convert any newlines to html <br>
-    $rawmsg = nl2br($rawmsg);
-
     // strip CODE bbcode, optionally perform Geshi color coding
     $rawmsg = preg_replace_callback('#\[code(=.*?)?\](.*?)([\r\n]*)\[/code\]#si', '_parseubb_codeblock', $rawmsg);
@@ -422 +419 @@
     $rawmsg = preg_replace_callback('#\[url(=.*?)\](.*?)([\r\n]*)\[/url\]#si', '_parseubb_urlblock', $rawmsg);
 
+    // convert any newlines to html <br>
+    $rawmsg = nl2br($rawmsg);
+
     // strip IMG bbcode
-//  $rawmsg = preg_replace_callback('#\[img\](.*?)([\r\n]*)\[/img\]#si', '_parseubb_imgblock', $rawmsg);
+    $rawmsg = preg_replace_callback('#\[img\](.*?)([\r\n]*)\[/img\]#si', '_parseubb_imgblock', $rawmsg);
 
     // detect and convert wikitags to wiki bbcodes if needed
@@ -442 +442 @@
     // re-insert the saved img blocks
     foreach($imgblocks as $key => $imgblock) {
-        $rawmsg = str_replace("{*@*".$key."*@*}", $imgblock[0], $rawmsg);
+        $rawmsg = str_replace("{@*@".$key."@*@}", "[img]".$imgblock[0]."[/img]", $rawmsg);
     }