Changeset 54553 for branches/5.7/src/wp-includes/comment.php

Timestamp:

10/17/2022 05:53:05 PM (2 years ago)

Author:

audrasjb

Message:

Grouped backports to the 5.7 branch.

• Editor: Bump @wordpress packages for the branch,
• Media: Refactor search by filename within the admin,
• REST API: Lockdown post parameter of the terms endpoint,
• Customize: Escape blogname option in underscores templates,
• Query: Validate relation in WP_Date_Query,
• Posts, Post types: Apply KSES to post-by-email content,
• General: Validate host on "Are you sure?" screen,
• Posts, Post types: Remove emails from post-by-email logs,
• Pings/trackbacks: Apply KSES to all trackbacks,
• Mail: Reset PHPMailer properties between use,
• Comments: Apply kses when editing comments,
• Widgets: Escape RSS error messages for display.

Merges [54521-54530] to the 5.7 branch.
Props audrasjb, costdev, cu121, dd32, davidbaumwald, ehtis, johnbillion, johnjamesjacoby, martinkrcho, matveb, oztaser, paulkevan, peterwilsoncc, ravipatel, SergeyBiryukov, talldanwp, timothyblynjacobs, tykoted, voldemortensen, vortfu, xknown.

Location:

branches/5.7

Files:

• . (modified) (1 prop)
• src/wp-includes/comment.php (modified) (2 diffs)

branches/5.7/src/wp-includes/comment.php

@@ -2462 +2462 @@
     }
 
+    $filter_comment = false;
+    if ( ! has_filter( 'pre_comment_content', 'wp_filter_kses' ) ) {
+        $filter_comment = ! user_can( isset( $comment['user_id'] ) ? $comment['user_id'] : 0, 'unfiltered_html' );
+    }
+
+    if ( $filter_comment ) {
+        add_filter( 'pre_comment_content', 'wp_filter_kses' );
+    }
+
     // Escape data pulled from DB.
     $comment = wp_slash( $comment );
@@ -2471 +2480 @@
 
     $commentarr = wp_filter_comment( $commentarr );
+
+    if ( $filter_comment ) {
+        remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+    }
 
     // Now extract the merged array.