Changeset 27094 for trunk/src/wp-includes/formatting.php

Timestamp:

02/05/2014 12:45:53 AM (11 years ago)

Author:

azaozz

Message:

Consolidate handling of <object>, <audio> and <video> in wpautop() and add unit tests for them. Part props wonderboymusic, see #26864

File:

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

trunk/src/wp-includes/formatting.php

@@ -239 +239 @@
     $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
     $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
-    if ( strpos($pee, '<object') !== false ) {
-        $pee = preg_replace('|\s*<param([^>]*)>\s*|', "<param$1>", $pee); // no pee inside object/embed
-        $pee = preg_replace('|\s*</embed>\s*|', '</embed>', $pee);
-    }
+
+    if ( strpos( $pee, '</object>' ) !== false ) {
+        // no P/BR around param and embed
+        $pee = preg_replace( '|(<object[^>]*>)\s*|', '$1', $pee );
+        $pee = preg_replace( '|\s*</object>|', '</object>', $pee );
+        $pee = preg_replace( '%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $pee );
+    }
+
+    if ( strpos( $pee, '<source' ) !== false || strpos( $pee, '<track' ) !== false ) {
+        // no P/BR around source and track
+        $pee = preg_replace( '%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $pee );
+        $pee = preg_replace( '%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee );
+        $pee = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee );
+    }
+
     $pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
     // make paragraphs, including one at the end
     $pees = preg_split('/\n\s*\n/', $pee, -1, PREG_SPLIT_NO_EMPTY);
     $pee = '';
-    foreach ( $pees as $tinkle )
+
+    foreach ( $pees as $tinkle ) {
         $pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
+    }
+
     $pee = preg_replace('|<p>\s*</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
     $pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
@@ -257 +271 @@
     $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
     $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+
     if ( $br ) {
         $pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
@@ -262 +277 @@
         $pee = str_replace('<WPPreserveNewline />', "\n", $pee);
     }
+
     $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
     $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);