Changeset 48140 for trunk/src/wp-includes/comment-template.php

Timestamp:

06/23/2020 01:51:03 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Comments: Remove wp_get_include_unapproved_comments_argument() for now.

The function seems too specific and low-level for an abstraction, is only used in two places, and does not provide a significant benefit in terms of reducing code duplication.

Follow-up to [48133].

See #8973.

File:

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

trunk/src/wp-includes/comment-template.php

@@ -1331 +1331 @@
  *
  * @since 1.5.0
- * @since 5.5.0 Removed the need to use the $user_ID global.
  *
  * @global WP_Query   $wp_query         WordPress Query object.
@@ -1397 +1396 @@
     }
 
-    $include_unapproved = wp_get_include_unapproved_comments_argument();
-    if ( $include_unapproved ) {
-        $comment_args['include_unapproved'] = $include_unapproved;
+    if ( is_user_logged_in() ) {
+        $comment_args['include_unapproved'] = array( get_current_user_id() );
+    } else {
+        $unapproved_email = wp_get_unapproved_comment_author_email();
+
+        if ( $unapproved_email ) {
+            $comment_args['include_unapproved'] = array( $unapproved_email );
+        }
     }
 
@@ -2098 +2102 @@
 
                 if ( is_user_logged_in() ) {
-                    $comment_args['include_unapproved'] = get_current_user_id();
+                    $comment_args['include_unapproved'] = array( get_current_user_id() );
                 } else {
                     $unapproved_email = wp_get_unapproved_comment_author_email();