Changeset 37298

Timestamp:

04/22/2016 07:07:03 AM (9 years ago)

Author:

pento

Message:

Smilies: Move convert_smilies to happen later in the the_content filter.

In particular, we want it to occur after shortcode handling. The smiley conversion routine doesn't have any concept of shortcode structure, so may inadvertantly replace a smiley with HTML inside a shortcode attribute, which will cause the shortcode to not be parsed correctly.

Props Unyson for the initial suggested fix.

Fixes #36306.

Location:

trunk

Files:

• src/wp-includes/default-filters.php (modified) (1 diff)
• tests/phpunit/tests/shortcode.php (modified) (3 diffs)

trunk/src/wp-includes/default-filters.php

@@ -131 +131 @@
 
 add_filter( 'the_content', 'wptexturize'                       );
-add_filter( 'the_content', 'convert_smilies'                   );
+add_filter( 'the_content', 'convert_smilies',               20 );
 add_filter( 'the_content', 'wpautop'                           );
 add_filter( 'the_content', 'shortcode_unautop'                 );

trunk/tests/phpunit/tests/shortcode.php

@@ -5 +5 @@
 class Tests_Shortcode extends WP_UnitTestCase {
 
-    protected $shortcodes = array( 'test-shortcode-tag', 'footag', 'bartag', 'baztag', 'dumptag', 'hyphen', 'hyphen-foo', 'hyphen-foo-bar', 'url' );
+    protected $shortcodes = array( 'test-shortcode-tag', 'footag', 'bartag', 'baztag', 'dumptag', 'hyphen', 'hyphen-foo', 'hyphen-foo-bar', 'url', 'img' );
 
     function setUp() {
@@ -77 +77 @@
     function _shortcode_url() {
         return 'http://www.wordpress.org/';
+    }
+
+    function _shortcode_img( $atts ) {
+        $out = '<img';
+        foreach ( $atts as $k => $v ) {
+            $out .= " $k=\"$v\"";
+        }
+        $out .= ' />';
+
+        return $out;
     }
 
@@ -658 +668 @@
         $this->assertEquals($expected, $out);
     }
+
+    /**
+     * @ticket 36306
+     */
+    function test_smilies_arent_converted() {
+        $out = apply_filters( 'the_content', '[img alt="Hello :-) World"]' );
+        $expected = "<img alt=\"Hello :-) World\" />\n";
+        $this->assertEquals( $expected, $out );
+    }
 }