Ticket #3201: 3201.diff

wp-includes/formatting.php

@@ -609 +609 @@
         if (get_option('use_smilies')) {
                 // 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
-                $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;
-                }
+                $output = implode('', preg_replace($wp_smiliessearch, $wp_smiliesreplace, $textarr));
         } else {
                 // return default text.
                 $output = $text;

wp-includes/vars.php

@@ -87 +87 @@
 
 // generates smilies' search & replace arrays
 foreach($wpsmiliestrans as $smiley => $img) {
-        $wp_smiliessearch[] = '/(\s|^)?'.preg_quote($smiley, '/').'(\b|\s)/';
+        $wp_smiliessearch[] = '/(\s|^|[^<])?'.preg_quote($smiley, '/').'(\b|\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' /> ";
 }