Changeset 44499 for trunk/src/wp-includes/link-template.php

Timestamp:

01/09/2019 05:59:49 AM (10 months ago)

Author:

pento

Message:

Comments: Add a new is_avatar_comment_type() function.

This function splits the get_avatar_comment_types filter out of get_avatar_data().

Props dshanske, birgire.
Fixes #44033.

File:

• trunk/src/wp-includes/link-template.php (modified) (2 diffs)

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

@@ -3938 +3938 @@
 }
 
+
+/**
+ * Check if this comment type allows avatars to be retrieved.
+ *
+ * @since 5.1.0
+ *
+ * @param string $comment_type Comment type to check.
+ * @return bool Whether the comment type is allowed for retrieving avatars.
+ */
+function is_avatar_comment_type( $comment_type ) {
+    /**
+     * Filters the list of allowed comment types for retrieving avatars.
+     *
+     * @since 3.0.0
+     *
+     * @param array $types An array of content types. Default only contains 'comment'.
+     */
+    $allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
+
+    return in_array( $comment_type, (array) $allowed_comment_types, true );
+}
+
+
 /**
  * Retrieves default data about the avatar.
@@ -4083 +4106 @@
         $user = get_user_by( 'id', (int) $id_or_email->post_author );
     } elseif ( $id_or_email instanceof WP_Comment ) {
-        /**
-         * Filters the list of allowed comment types for retrieving avatars.
-         *
-         * @since 3.0.0
-         *
-         * @param array $types An array of content types. Default only contains 'comment'.
-         */
-        $allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-        if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
+        if ( ! is_avatar_comment_type( get_comment_type( $id_or_email ) ) ) {
             $args['url'] = false;
             /** This filter is documented in wp-includes/link-template.php */