Changeset 40091

Timestamp:

02/21/2017 03:41:42 AM (7 years ago)

Author:

dd32

Message:

Formatting: fix wpautop() to stop adding paragraph tags around <figcaption>.

Props azaozz, pbearne for tests.
Merges [39912], [39914] to the 4.7 branch.
Fixes #39307 for 4.7.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-admin/js/editor.js (modified) (2 diffs)
• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/Autop.php (modified) (1 diff)

branches/4.7/src/wp-admin/js/editor.js

@@ -119 +119 @@
         // Replace paragraphs with double line breaks
         function removep( html ) {
-            var blocklist = 'blockquote|ul|ol|li|dl|dt|dd|table|thead|tbody|tfoot|tr|th|td|h[1-6]|fieldset',
+            var blocklist = 'blockquote|ul|ol|li|dl|dt|dd|table|thead|tbody|tfoot|tr|th|td|h[1-6]|fieldset|figure',
                 blocklist1 = blocklist + '|div|p',
                 blocklist2 = blocklist + '|pre',
@@ -256 +256 @@
                     return a.replace( /\n/g, '<wp-line-break>' );
                 });
+            }
+
+            if ( text.indexOf( '<figcaption' ) !== -1 ) {
+                text = text.replace( /\s*(<figcaption[^>]*>)/g, '$1' );
+                text = text.replace( /<\/figcaption>\s*/g, '</figcaption>' );
             }
 

branches/4.7/src/wp-includes/formatting.php

@@ -505 +505 @@
         $pee = preg_replace( '%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee );
         $pee = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee );
+    }
+
+    // Collapse line breaks before and after <figcaption> elements.
+    if ( strpos( $pee, '<figcaption' ) !== false ) {
+        $pee = preg_replace( '|\s*(<figcaption[^>]*>)|', '$1', $pee );
+        $pee = preg_replace( '|</figcaption>\s*|', '</figcaption>', $pee );
     }
 

branches/4.7/tests/phpunit/tests/formatting/Autop.php

@@ -535 +535 @@
         $this->assertEquals( $expected, trim( wpautop( $content ) ) );
     }
+
+    /**
+     * wpautop() should not add extra </p> before <figcaption>
+     *
+     * @covers ::wpautop
+     * @uses trim
+     *
+     * @ticket 39307
+     */
+    function test_that_wpautop_doses_not_add_extra_closing_p_in_figure() {
+        $content1 = $expected1 = '<figure><img src="example.jpg" /><figcaption>Caption</figcaption></figure>';
+
+        $content2 = '<figure>
+<img src="example.jpg" />
+<figcaption>Caption</figcaption>
+</figure>';
+
+        $expected2 = '<figure>
+<img src="example.jpg" /><figcaption>Caption</figcaption></figure>';
+
+        $this->assertEquals( $expected1, trim( wpautop( $content1 ) ) );
+        $this->assertEquals( $expected2, trim( wpautop( $content2 ) ) );
+    }
+
 }