diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index 0859180d2c..e9c0815c85 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -3295,29 +3295,34 @@ function attachment_submitbox_metadata() {
 	if ( $author->exists() ) {
 		$uploaded_by_name = $author->display_name ? $author->display_name : $author->nickname;
 		$uploaded_by_link = get_edit_user_link( $author->ID );
-	} ?>
+	}
+	?>
 	<div class="misc-pub-section misc-pub-uploadedby">
-		<?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 else: ?>
-			<?php _e( 'Uploaded by:' ); ?> <strong><?php echo $uploaded_by_name ?></strong>
-		<?php endif; ?>
+		<?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 } else { ?>
+			<?php _e( 'Uploaded by:' ); ?> <strong><?php echo $uploaded_by_name; ?></strong>
+		<?php } ?>
 	</div>
 
-	<?php if ( $post->post_parent ) :
+	<?php
+	if ( $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_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">
-				<?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 else: ?>
+				<?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 } else { ?>
 					<?php _e( 'Uploaded to:' ); ?> <strong><?php echo $uploaded_to_title; ?></strong>
-				<?php endif; ?>
+				<?php } ?>
 			</div>
-		<?php endif; ?>
-	<?php endif; ?>
+			<?php
+		}
+	}
+	?>
 
 	<div class="misc-pub-section misc-pub-attachment">
 		<label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index a73544b588..3ea44eafaf 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -3809,7 +3809,8 @@ function wp_prepare_attachment_for_js( $attachment ) {
 
 	$author = new WP_User( $attachment->post_author );
 	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 );
 	} else {
 		$response['authorName'] = __( '(no author)' );