WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-16 11:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Coding Standards: Fix WPCS issues in [49207].

Browse Source 
See #46866.
Built from https://develop.svn.wordpress.org/trunk@49209


git-svn-id: http://core.svn.wordpress.org/trunk@48971 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-10-19 20:45:06 +00:00
parent 3d02b5b585
commit e209e00734
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3295,29 +3295,34 @@ function attachment_submitbox_metadata() {
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 );
} ?> }
?>
<div class="misc-pub-section misc-pub-uploadedby"> <div class="misc-pub-section misc-pub-uploadedby">
<?php if ( $uploaded_by_link ) : ?> <?php if ( $uploaded_by_link ) { ?>
<?php _e( 'Uploaded by:' ); ?> <a href="<?php echo $uploaded_by_link ?>"><strong><?php echo $uploaded_by_name ?></strong></a> <?php _e( 'Uploaded by:' ); ?> <a href="<?php echo $uploaded_by_link; ?>"><strong><?php echo $uploaded_by_name; ?></strong></a>
<?php else: ?> <?php } else { ?>
<?php _e( 'Uploaded by:' ); ?> <strong><?php echo $uploaded_by_name ?></strong> <?php _e( 'Uploaded by:' ); ?> <strong><?php echo $uploaded_by_name; ?></strong>
<?php endif; ?> <?php } ?>
</div> </div>
<?php if ( $post->post_parent ) : <?php
if ( $post->post_parent ) {
$post_parent = get_post( $post->post_parent ); $post_parent = get_post( $post->post_parent );
if ( $post_parent ) : if ( $post_parent ) {
$uploaded_to_title = $post_parent->post_title ? $post_parent->post_title : __( '(no title)' ); $uploaded_to_title = $post_parent->post_title ? $post_parent->post_title : __( '(no title)' );
$uploaded_to_link = get_edit_post_link( $post->post_parent, 'raw' ); ?> $uploaded_to_link = get_edit_post_link( $post->post_parent, 'raw' );
?>
<div class="misc-pub-section misc-pub-uploadedto"> <div class="misc-pub-section misc-pub-uploadedto">
<?php if ( $uploaded_to_link ) : ?> <?php if ( $uploaded_to_link ) { ?>
<?php _e( 'Uploaded to:' ); ?> <a href="<?php echo $uploaded_to_link ?>"><strong><?php echo $uploaded_to_title; ?></strong></a> <?php _e( 'Uploaded to:' ); ?> <a href="<?php echo $uploaded_to_link; ?>"><strong><?php echo $uploaded_to_title; ?></strong></a>
<?php else: ?> <?php } else { ?>
<?php _e( 'Uploaded to:' ); ?> <strong><?php echo $uploaded_to_title; ?></strong> <?php _e( 'Uploaded to:' ); ?> <strong><?php echo $uploaded_to_title; ?></strong>
<?php endif; ?> <?php } ?>
</div> </div>
<?php endif; ?> <?php
<?php endif; ?> }
}
?>
<div class="misc-pub-section misc-pub-attachment"> <div class="misc-pub-section misc-pub-attachment">
<label for="attachment_url"><?php _e( 'File URL:' ); ?></label> <label for="attachment_url"><?php _e( 'File URL:' ); ?></label>

3
wp-includes/media.php
View File

@ -3809,7 +3809,8 @@ 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() ) {
$response['authorName'] = html_entity_decode( $author->display_name ? $author->display_name : $author->nickname, ENT_QUOTES, get_bloginfo( 'charset' ) ); $author_name = $author->display_name ? $author->display_name : $author->nickname;
$response['authorName'] = html_entity_decode( $author_name, ENT_QUOTES, get_bloginfo( 'charset' ) );
$response['authorLink'] = get_edit_user_link( $author->ID ); $response['authorLink'] = get_edit_user_link( $author->ID );
} else { } else {
$response['authorName'] = __( '(no author)' ); $response['authorName'] = __( '(no author)' );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-alpha-49208'; $wp_version = '5.6-alpha-49209';
/** /**
* 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.