Ticket #27587: prior-work.patch

src/wp-includes/formatting.php

@@ -1909 +1909 @@
          */
         $src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
 
-        return sprintf( ' <img src="%s" alt="%s" class="wp-smiley" /> ', esc_url( $src_url ), esc_attr( $smiley ) );
+        return sprintf( '<img src="%s" alt="%s" class="wp-smiley" />', esc_url( $src_url ), esc_attr( $smiley ) );
 }
 
 /**

src/wp-includes/functions.php

@@ -2566 +2566 @@
          */
         krsort($wpsmiliestrans);
 
-        $wp_smiliessearch = '/((?:\s|^)';
+        $spaces = wp_spaces_regexp();
+ 
+        // Begin first "subpattern"
+        $wp_smiliessearch = '/(?<=' . $spaces . '|^)';
 
         $subchar = '';
         foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
@@ -2576 +2579 @@
                 // new subpattern?
                 if ($firstchar != $subchar) {
                         if ($subchar != '') {
-                                $wp_smiliessearch .= ')(?=\s|$))|((?:\s|^)'; ;
+                                $wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern"
+                                $wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern"
                         }
                         $subchar = $firstchar;
                         $wp_smiliessearch .= preg_quote($firstchar, '/') . '(?:';
@@ -2586 +2590 @@
                 $wp_smiliessearch .= preg_quote($rest, '/');
         }
 
-        $wp_smiliessearch .= ')(?=\s|$))/m';
+        $wp_smiliessearch .= ')(?=' . $spaces . '|$)/m';
 
 }
 

tests/phpunit/tests/formatting/Smilies.php

@@ -275 +275 @@
 
                 $wpsmiliestrans = $orig_trans; // reset original translations array
         }
-}
- No newline at end of file
+
+        /**
+         * Check that $wp_smiliessearch pattern will match smilies
+         * between spaces, but never capture those spaces.
+         *
+         * Further check that spaces aren't randomly deleted
+         * or added when replacing the text with an image.
+         *
+         * @ticket 22692
+         */
+        function test_spaces_around_smilies() {
+                $nbsp = "\xC2\xA0";
+
+                $input  = array();
+                $output = array();
+
+                $input[]  = 'My test :) smile';
+                $output[] = array('test <img ', 'alt=":)"', ' /> smile');
+
+                $input[]  = 'My test ;) smile';
+                $output[] = array('test <img ', 'alt=";)"', ' /> smile');
+
+                $input[]  = 'My test &nbsp;:)&nbsp;smile';
+                $output[] = array('test &nbsp;<img ', 'alt=":)"', ' />&nbsp;smile');
+
+                $input[]  = 'My test &nbsp;;)&nbsp;smile';
+                $output[] = array('test &nbsp;<img ', 'alt=";)"', ' />&nbsp;smile');
+
+                $input[]  = "My test {$nbsp}:){$nbsp}smile";
+                $output[] = array("test {$nbsp}<img ", 'alt=":)"', " />{$nbsp}smile");
+
+                $input[]  = "My test {$nbsp};){$nbsp}smile";
+                $output[] = array("test {$nbsp}<img ", 'alt=";)"', " />{$nbsp}smile");
+
+                foreach($input as $key => $in) {
+                        $result = convert_smilies( $in );
+                        foreach($output[$key] as $out) {
+
+                                // Each output element must appear in the results.
+                                $this->assertContains( $out, $result );
+
+                        }
+                }
+        }
+}