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

Timestamp:

06/10/2014 02:02:23 AM (10 years ago)

Author:

wonderboymusic

Message:

smilies_init(), treat   like whitespace when converting smilies.

Adds unit tests.

Props miqrogroove.
Fixes #27587.

File:

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

trunk/src/wp-includes/functions.php

@@ -2714 +2714 @@
     krsort($wpsmiliestrans);
 
-    $wp_smiliessearch = '/((?:\s|^)';
+    $spaces = wp_spaces_regexp();
+
+    // Begin first "subpattern"
+    $wp_smiliessearch = '/(?<=' . $spaces . '|^)';
 
     $subchar = '';
@@ -2724 +2727 @@
         if ($firstchar != $subchar) {
             if ($subchar != '') {
-                $wp_smiliessearch .= ')(?=\s|$))|((?:\s|^)'; ;
+                $wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern"
+                $wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern"
             }
             $subchar = $firstchar;
@@ -2734 +2738 @@
     }
 
-    $wp_smiliessearch .= ')(?=\s|$))/m';
+    $wp_smiliessearch .= ')(?=' . $spaces . '|$)/m';
 
 }