Changeset 54546 for branches/3.7/src/wp-includes/comment.php

Timestamp:

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

Author:

SergeyBiryukov

Message:

Grouped backports to the 3.7 branch.

• 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,
• Comments: Apply kses when editing comments,
• Mail: Reset PHPMailer properties between use,
• Widgets: Escape RSS error messages for display.

Merges [54521], [54522], [54523], [54525], [54527], [54529], [54541] to the 3.7 branch.
Props voldemortensen, johnbillion, paulkevan, peterwilsoncc, xknown, dd32, audrasjb, martinkrcho, davidbaumwald, tykoted, matveb, talldanwp.

Location:

branches/3.7

Files:

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

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

@@ -1509 +1509 @@
         return 0;
 
+    $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);
@@ -1518 +1527 @@
 
     $commentarr = wp_filter_comment( $commentarr );
+
+    if ( $filter_comment ) {
+        remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+    }
 
     // Now extract the merged array.