Ticket #44033: 44033.diff

src/wp-includes/link-template.php

@@ -3927 +3927 @@
         return $args['url'];
 }
 
+
+/**
+ * Is this an allowed comment type for retrieving avatars.
+ *
+ * @since 4.9.7
+ *
+ * @param string $comment_type Comment Type
+ *
+ * @return false|string The URL of the avatar we found, or false if we couldn't find an avatar.
+ */
+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 );
+}
+
+
 /**
  * Retrieves default data about the avatar.
  *
@@ -4071 +4094 @@
                 // Post Object
                 $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 */
                         return apply_filters( 'get_avatar_data', $args, $id_or_email );