WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
Built from https://develop.svn.wordpress.org/trunk@49979


git-svn-id: http://core.svn.wordpress.org/trunk@49680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2021-01-18 12:55:07 +00:00
parent 1671941bff
commit 489e47692a
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/media.php
View File

@ -3288,10 +3288,11 @@ function attachment_submitbox_metadata() {
$att_url = wp_get_attachment_url( $attachment_id ); $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_name = __( '(no author)' );
$uploaded_by_link = ''; $uploaded_by_link = '';
if ( $author->exists() ) { if ( $author->exists() ) {
$uploaded_by_name = $author->display_name ? $author->display_name : $author->nickname; $uploaded_by_name = $author->display_name ? $author->display_name : $author->nickname;
$uploaded_by_link = get_edit_user_link( $author->ID ); $uploaded_by_link = get_edit_user_link( $author->ID );

1
wp-includes/media.php
View File

@ -3929,6 +3929,7 @@ function wp_prepare_attachment_for_js( $attachment ) {
); );
$author = new WP_User( $attachment->post_author ); $author = new WP_User( $attachment->post_author );
if ( $author->exists() ) { if ( $author->exists() ) {
$author_name = $author->display_name ? $author->display_name : $author->nickname; $author_name = $author->display_name ? $author->display_name : $author->nickname;
$response['authorName'] = html_entity_decode( $author_name, ENT_QUOTES, get_bloginfo( 'charset' ) ); $response['authorName'] = html_entity_decode( $author_name, ENT_QUOTES, get_bloginfo( 'charset' ) );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.7-alpha-49978'; $wp_version = '5.7-alpha-49979';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.