From b6830fabc4a19ddd5031a9691332fb37ef5c70d2 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 18 Jan 2021 12:53:30 +0000 Subject: [PATCH] Media: Use consistent method for instantiating an attachment author object in Media Library. Previously, attachments without an author could cause a PHP fatal error due to calling the `::exists()` method on a `false` value. Props antpb, carloscastilloadhoc, hellofromTonya, garrett-eclipse. Fixes #52030. git-svn-id: https://develop.svn.wordpress.org/trunk@49979 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/media.php | 3 ++- src/wp-includes/media.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php index bd1cbeb037..8e929f38a7 100644 --- a/src/wp-admin/includes/media.php +++ b/src/wp-admin/includes/media.php @@ -3288,10 +3288,11 @@ function attachment_submitbox_metadata() { $att_url = wp_get_attachment_url( $attachment_id ); - $author = get_userdata( $post->post_author ); + $author = new WP_User( $post->post_author ); $uploaded_by_name = __( '(no author)' ); $uploaded_by_link = ''; + if ( $author->exists() ) { $uploaded_by_name = $author->display_name ? $author->display_name : $author->nickname; $uploaded_by_link = get_edit_user_link( $author->ID ); diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php index a22a1f359f..d29426213e 100644 --- a/src/wp-includes/media.php +++ b/src/wp-includes/media.php @@ -3929,6 +3929,7 @@ function wp_prepare_attachment_for_js( $attachment ) { ); $author = new WP_User( $attachment->post_author ); + if ( $author->exists() ) { $author_name = $author->display_name ? $author->display_name : $author->nickname; $response['authorName'] = html_entity_decode( $author_name, ENT_QUOTES, get_bloginfo( 'charset' ) );