Changeset 26191 for trunk/src/wp-includes/functions.php

Timestamp:

11/15/2013 02:45:39 AM (11 years ago)

Author:

wonderboymusic

Message:

Don't place smilies inside of pre or code tags. Don't skip smilie after a smilie with an 8 in it. Fix regular expression used for smiley translations to work when there is only one registered emoticon.

Props solarissmoke, soulseekah, mdbitz, yonasy. ht to mdbitz for the Unit Tests and a comprehensive patch.
Fixes #16448, #20124, #25303.

File:

• trunk/src/wp-includes/functions.php (modified) (4 diffs)

trunk/src/wp-includes/functions.php

@@ -2478 +2478 @@
 }
 
+
 /**
  * Convert smiley code to the icon graphic file equivalent.
@@ -2567 +2568 @@
     krsort($wpsmiliestrans);
 
-    $wp_smiliessearch = '/(?:\s|^)';
+    $wp_smiliessearch = '/((?:\s|^)';
 
     $subchar = '';
@@ -2577 +2578 @@
         if ($firstchar != $subchar) {
             if ($subchar != '') {
-                $wp_smiliessearch .= ')|(?:\s|^)';
+                $wp_smiliessearch .= ')(?=\s|$))|((?:\s|^)'; ;
             }
             $subchar = $firstchar;
@@ -2587 +2588 @@
     }
 
-    $wp_smiliessearch .= ')(?:\s|$)/m';
+    $wp_smiliessearch .= ')(?=\s|$))/m';
+
 }