Changeset 62842

Timestamp:

09/17/2026 05:39:30 PM (5 weeks ago)

Author:

desrosj

Message:

Formatting: Prevent wpautop() moving a paragraph into an attribute of a blockquote.

Merges r63665 to the 7.1 branch.

Props johnbillion, westonruter, jonsurrell, joehoyle, dmsnell, xknown, jorbin, jeremyfelt, rafiem.

Built from ​https://develop.svn.wordpress.org/branches/7.1@63668

Location:

branches/7.1/wp-includes

Files:

• formatting.php (modified) (1 diff)
• version.php (modified) (1 diff)

branches/7.1/wp-includes/formatting.php

@@ -561 +561 @@
 
         // If a <blockquote> is wrapped with a <p>, move it inside the <blockquote>.
-        $text = preg_replace( '|<p><blockquote([^>]*)>|i', '<blockquote$1><p>', $text );
+        $text = preg_replace( '!<p><blockquote((?:[^>"\']|"[^"]*"|\'[^\']*\')*)>!i', '<blockquote$1><p>', $text );
         $text = str_replace( '</blockquote></p>', '</p></blockquote>', $text );
 

branches/7.1/wp-includes/version.php

@@ -17 +17 @@
  * @global string $wp_version
  */
-$wp_version = '7.1.1-RC1-63667';
+$wp_version = '7.1.1-RC1-63668';
 
 /**