Ticket #20124: functions.php.3.diff

wp-includes/functions.php

@@ -2337 +2337 @@
          */
         krsort($wpsmiliestrans);
 
-        $wp_smiliessearch = '/(?:\s|^)';
+        $wp_smiliessearch = '/((?:\s|^)';
 
         $subchar = '';
         foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
@@ -2347 +2347 @@
                 // new subpattern?
                 if ($firstchar != $subchar) {
                         if ($subchar != '') {
-                                $wp_smiliessearch .= ')|(?:\s|^)';
+                                $wp_smiliessearch .= ')(?=\s|$))|((?:\s|^)';
                         }
                         $subchar = $firstchar;
                         $wp_smiliessearch .= preg_quote($firstchar, '/') . '(?:';
@@ -2357 +2357 @@
                 $wp_smiliessearch .= preg_quote($rest, '/');
         }
 
-        $wp_smiliessearch .= ')(?:\s|$)/m';
+        $wp_smiliessearch .= ')(?=\s|$))/m';
 }
 
 /**