Changeset 4380

Timestamp:

10/12/2006 10:14:14 AM (18 years ago)

Author:

markjaquith

Message:

Somewhat stricter smilies replacements by Nazgul. fixes #3222

Location:

trunk/wp-includes

Files:

• formatting.php (modified) (1 diff)
• vars.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -619 +619 @@
         // HTML loop taken from texturize function, could possible be consolidated
         $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
-        $output = implode('', preg_replace($wp_smiliessearch, $wp_smiliesreplace, $textarr));
+        $stop = count($textarr);// loop stuff 
+        for ($i = 0; $i < $stop; $i++) { 
+            $content = $textarr[$i]; 
+            if ((strlen($content) > 0) && ('<' != $content{0})) { // If it's not a tag 
+                $content = preg_replace($wp_smiliessearch, $wp_smiliesreplace, $content); 
+            } 
+            $output .= $content; 
+        }
     } else {
         // return default text.

trunk/wp-includes/vars.php

@@ -88 +88 @@
 // generates smilies' search & replace arrays
 foreach($wpsmiliestrans as $smiley => $img) {
-    $wp_smiliessearch[] = '/(\s|^|[^<])?'.preg_quote($smiley, '/').'(\b|\s|$)/';
+    $wp_smiliessearch[] = '/(\s|^)'.preg_quote($smiley, '/').'(\s|$)/';
     $smiley_masked = htmlspecialchars( trim($smiley) , ENT_QUOTES);
     $wp_smiliesreplace[] = " <img src='" . get_option('siteurl') . "/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";