Changeset 39912

Timestamp:

01/16/2017 01:05:33 AM (8 years ago)

Author:

azaozz

Message:

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

Fixes #39307 for trunk.

Location:

trunk/src

Files:

• wp-admin/js/editor.js (modified) (2 diffs)
• wp-includes/formatting.php (modified) (1 diff)

trunk/src/wp-admin/js/editor.js

@@ -168 +168 @@
          */
         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',
@@ -330 +330 @@
                     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>' );
             }
 

trunk/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 );
     }