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

Timestamp:

05/15/08 15:10:13 (4 years ago)

Author:

hverton

Message:

fixed typo in the color BBcode parser
fixed failure in parsing URL BBcode when it had a WikiLink match in the URL
fixed bug in groupaccess() causing a query failure for webmasters
fixed not setting the last login date when confirming a registration (which auto logs in the user)
added a "View Posts" button to the forum index and the thread index pages, which gives you a flat list (newest first) with a search option

File:

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

trunk/includes/forum_functions_include.php

@@ -383 +383 @@
     if (strlen($rawmsg)) $message .= $rawmsg;
 
-    // find remaining URL's in the text, and convert them to a href as well
-    $pattern = '#(^|[^\"=]{1})(https?://|ftp://|mailto:|news:)([^(,\s<>\[\]\)]+)([,\s\n<>\)]|$)#sme';
-    $message = preg_replace($pattern,"'$1<a href=\'$2$3\' target=\'_blank\'>'.shortenlink('$2$3',83).'</a>$4'",$message);
-    // re-insert the saved url blocks
-    foreach($urlblocks as $urlblock) {
-        // find the first placeholder
-        $i = strpos($message, "{@@**@@}");
-        $message = substr($message, 0, $i).$urlblock.substr($message, $i+8);
-    }
-
     // detect and convert wikitags to wiki bbcodes if needed
     if (isset($settings['wiki_forum_links'])  && $settings['wiki_forum_links']) {
@@ -405 +395 @@
         $message = preg_replace($search, $replace, $message);
     }
+
+    // find remaining URL's in the text, and convert them to a href as well
+    $pattern = '#(^|[^\"=]{1})(https?://|ftp://|mailto:|news:)([^(,\s<>\[\]\)]+)([,\s\n<>\)]|$)#sme';
+    $message = preg_replace($pattern,"'$1<a href=\'$2$3\' target=\'_blank\'>'.shortenlink('$2$3',83).'</a>$4'",$message);
+    // re-insert the saved url blocks
+    foreach($urlblocks as $urlblock) {
+        // find the first placeholder
+        $i = strpos($message, "{@@**@@}");
+        $message = substr($message, 0, $i).$urlblock.substr($message, $i+8);
+    }
+
     // parse the smileys in the message
     if ($smileys) $message = parsesmileys($message);