Changeset 4283

Timestamp:

10/04/2006 02:21:27 AM (18 years ago)

Author:

ryan

Message:

Smiley parsing fixes from Nazgul. fixes #2444 #1279

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/formatting.php

@@ -614 +614 @@
             $content = $textarr[$i];
             if ((strlen($content) > 0) && ('<' != $content{0})) { // If it's not a tag
-                $content = str_replace($wp_smiliessearch, $wp_smiliesreplace, $content);
+                $content = preg_replace($wp_smiliessearch, $wp_smiliesreplace, $content);
             }
             $output .= $content;

trunk/wp-includes/vars.php

@@ -44 +44 @@
     ':shock:'   => 'icon_eek.gif',
     ':smile:'   => 'icon_smile.gif',
-    ' :???:'    => 'icon_confused.gif',
+    ':???:' => 'icon_confused.gif',
     ':cool:'    => 'icon_cool.gif',
     ':evil:'    => 'icon_evil.gif',
@@ -58 +58 @@
     ':mad:'     => 'icon_mad.gif',
     ':sad:'     => 'icon_sad.gif',
-    ' 8-)'      => 'icon_cool.gif',
-    ' 8-O'      => 'icon_eek.gif',
-    ' :-('      => 'icon_sad.gif',
-    ' :-)'      => 'icon_smile.gif',
-    ' :-?'      => 'icon_confused.gif',
-    ' :-D'      => 'icon_biggrin.gif',
-    ' :-P'      => 'icon_razz.gif',
-    ' :-o'      => 'icon_surprised.gif',
-    ' :-x'      => 'icon_mad.gif',
-    ' :-|'      => 'icon_neutral.gif',
-    ' ;-)'      => 'icon_wink.gif',
-    ' 8)'       => 'icon_cool.gif',
-    ' 8O'       => 'icon_eek.gif',
-    ' :('       => 'icon_sad.gif',
-    ' :)'       => 'icon_smile.gif',
-    ' :?'       => 'icon_confused.gif',
-    ' :D'       => 'icon_biggrin.gif',
-    ' :P'       => 'icon_razz.gif',
-    ' :o'       => 'icon_surprised.gif',
-    ' :x'       => 'icon_mad.gif',
-    ' :|'       => 'icon_neutral.gif',
-    ' ;)'       => 'icon_wink.gif',
+    '8-)'       => 'icon_cool.gif',
+    '8-O'       => 'icon_eek.gif',
+    ':-('       => 'icon_sad.gif',
+    ':-)'       => 'icon_smile.gif',
+    ':-?'       => 'icon_confused.gif',
+    ':-D'       => 'icon_biggrin.gif',
+    ':-P'       => 'icon_razz.gif',
+    ':-o'       => 'icon_surprised.gif',
+    ':-x'       => 'icon_mad.gif',
+    ':-|'       => 'icon_neutral.gif',
+    ';-)'       => 'icon_wink.gif',
+    '8)'        => 'icon_cool.gif',
+    '8O'        => 'icon_eek.gif',
+    ':('        => 'icon_sad.gif',
+    ':)'        => 'icon_smile.gif',
+    ':?'        => 'icon_confused.gif',
+    ':D'        => 'icon_biggrin.gif',
+    ':P'        => 'icon_razz.gif',
+    ':o'        => 'icon_surprised.gif',
+    ':x'        => 'icon_mad.gif',
+    ':|'        => 'icon_neutral.gif',
+    ';)'        => 'icon_wink.gif',
     ':!:'       => 'icon_exclaim.gif',
     ':?:'       => 'icon_question.gif',
@@ -88 +88 @@
 // generates smilies' search & replace arrays
 foreach($wpsmiliestrans as $smiley => $img) {
-    $wp_smiliessearch[] = $smiley;
+    $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' /> ";