diff --git a/wp-admin/about.php b/wp-admin/about.php
index b102329ef2..8c415dc318 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -40,7 +40,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 							__( 'Major Customizer Improvements, Code Error Checking, and More! %s' ),
 							'&#x1F389'
 						);
-					?>
+						?>
 				</h2>
 				<p><?php _e( 'Welcome to an improved Customizer workflow with design drafts, locking, scheduling, and preview links. What&#8217;s more, code syntax highlighting and error checking will make for a clean and smooth site building experience. Finally, if all that wasn&#8217;t pretty great, we&#8217;ve got a great new Gallery widget and improvements to theme browsing and switching.' ); ?></p>
 			</div>
@@ -181,7 +181,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 						__( 'Lend a Hand with Gutenberg %s' ),
 						'&#x1F91D'
 					);
-				?>
+					?>
 			</h2>
 			<p>
 			<?php
@@ -190,7 +190,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				__( 'https://wordpress.org/plugins/gutenberg/' ),
 				'https://github.com/WordPress/gutenberg'
 			);
-				?>
+			?>
 				</p>
 		</div>
 
@@ -204,7 +204,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 					__( 'Developer Happiness %s' ),
 					'&#x1F60A'
 				);
-			?>
+				?>
 			</h2>
 
 			<div class="under-the-hood two-col">
@@ -217,7 +217,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 							__( 'We&#8217;ve made numerous improvements to the Customizer JS API in WordPress 4.9, eliminating many pain points and making it just as easy to work with as the PHP API. There are also new base control templates, a date/time control, and section/panel/global notifications to name a few. <a href="%s">Check out the full list.</a>' ),
 							'https://make.wordpress.org/core/2017/11/01/improvements-to-the-customize-js-api-in-4-9/'
 						);
-					?>
+						?>
 					</p>
 				</div>
 				<div class="col">
diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index a3dab04d3d..fb08b47f1a 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -74,7 +74,8 @@ if ( get_option( 'db_upgraded' ) ) {
 		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) {
 			require_once( ABSPATH . WPINC . '/http.php' );
 			$response = wp_remote_get(
-				admin_url( 'upgrade.php?step=1' ), array(
+				admin_url( 'upgrade.php?step=1' ),
+				array(
 					'timeout'     => 120,
 					'httpversion' => '1.1',
 				)
diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php
index cf4670bbb1..19eaf99072 100644
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -63,7 +63,8 @@ if ( isset( $_REQUEST['attachment_id'] ) && ( $id = intval( $_REQUEST['attachmen
 		case 2:
 			add_filter( 'attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2 );
 			echo get_media_item(
-				$id, array(
+				$id,
+				array(
 					'send'   => false,
 					'delete' => true,
 				)
diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index d95ae0ded0..1d76632a76 100644
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -110,49 +110,49 @@ switch ( $action ) {
 		$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
 		$nonce_action .= $comment_id;
 
-	?>
+		?>
 	<div class="wrap">
 
 	<h1><?php echo esc_html( $title ); ?></h1>
 
-<?php
-switch ( $action ) {
-	case 'spam':
-		$caution_msg = __( 'You are about to mark the following comment as spam:' );
-		$button      = _x( 'Mark as Spam', 'comment' );
-		break;
-	case 'trash':
-		$caution_msg = __( 'You are about to move the following comment to the Trash:' );
-		$button      = __( 'Move to Trash' );
-		break;
-	case 'delete':
-		$caution_msg = __( 'You are about to delete the following comment:' );
-		$button      = __( 'Permanently Delete Comment' );
-		break;
-	default:
-		$caution_msg = __( 'You are about to approve the following comment:' );
-		$button      = __( 'Approve Comment' );
-		break;
-}
+		<?php
+		switch ( $action ) {
+			case 'spam':
+				$caution_msg = __( 'You are about to mark the following comment as spam:' );
+				$button      = _x( 'Mark as Spam', 'comment' );
+				break;
+			case 'trash':
+				$caution_msg = __( 'You are about to move the following comment to the Trash:' );
+				$button      = __( 'Move to Trash' );
+				break;
+			case 'delete':
+				$caution_msg = __( 'You are about to delete the following comment:' );
+				$button      = __( 'Permanently Delete Comment' );
+				break;
+			default:
+				$caution_msg = __( 'You are about to approve the following comment:' );
+				$button      = __( 'Approve Comment' );
+				break;
+		}
 
-if ( $comment->comment_approved != '0' ) { // if not unapproved
-	$message = '';
-	switch ( $comment->comment_approved ) {
-		case '1':
-			$message = __( 'This comment is currently approved.' );
-			break;
-		case 'spam':
-			$message = __( 'This comment is currently marked as spam.' );
-			break;
-		case 'trash':
-			$message = __( 'This comment is currently in the Trash.' );
-			break;
-	}
-	if ( $message ) {
-		echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
-	}
-}
-?>
+		if ( $comment->comment_approved != '0' ) { // if not unapproved
+			$message = '';
+			switch ( $comment->comment_approved ) {
+				case '1':
+					$message = __( 'This comment is currently approved.' );
+					break;
+				case 'spam':
+					$message = __( 'This comment is currently marked as spam.' );
+					break;
+				case 'trash':
+					$message = __( 'This comment is currently in the Trash.' );
+					break;
+			}
+			if ( $message ) {
+				echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
+			}
+		}
+		?>
 <div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>
 
 <table class="form-table comment-ays">
@@ -160,13 +160,13 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 <th scope="row"><?php _e( 'Author' ); ?></th>
 <td><?php comment_author( $comment ); ?></td>
 </tr>
-<?php if ( get_comment_author_email( $comment ) ) { ?>
+		<?php if ( get_comment_author_email( $comment ) ) { ?>
 <tr>
 <th scope="row"><?php _e( 'Email' ); ?></th>
 <td><?php comment_author_email( $comment ); ?></td>
 </tr>
 <?php } ?>
-<?php if ( get_comment_author_url( $comment ) ) { ?>
+		<?php if ( get_comment_author_url( $comment ) ) { ?>
 <tr>
 <th scope="row"><?php _e( 'URL' ); ?></th>
 <td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
@@ -175,33 +175,33 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 <tr>
 	<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
 	<td>
-	<?php
+		<?php
 		$post_id = $comment->comment_post_ID;
-	if ( current_user_can( 'edit_post', $post_id ) ) {
-		$post_link  = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
-		$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
-	} else {
-		$post_link = esc_html( get_the_title( $post_id ) );
-	}
+		if ( current_user_can( 'edit_post', $post_id ) ) {
+			$post_link  = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+			$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+		} else {
+			$post_link = esc_html( get_the_title( $post_id ) );
+		}
 		echo $post_link;
 
-	if ( $comment->comment_parent ) {
-		$parent      = get_comment( $comment->comment_parent );
-		$parent_link = esc_url( get_comment_link( $parent ) );
-		$name        = get_comment_author( $parent );
-		printf(
-			/* translators: %s: comment link */
-			' | ' . __( 'In reply to %s.' ),
-			'<a href="' . $parent_link . '">' . $name . '</a>'
-		);
-	}
-	?>
+		if ( $comment->comment_parent ) {
+			$parent      = get_comment( $comment->comment_parent );
+			$parent_link = esc_url( get_comment_link( $parent ) );
+			$name        = get_comment_author( $parent );
+			printf(
+				/* translators: %s: comment link */
+				' | ' . __( 'In reply to %s.' ),
+				'<a href="' . $parent_link . '">' . $name . '</a>'
+			);
+		}
+		?>
 	</td>
 	</tr>
 	<tr>
 	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
 	<td>
-	<?php
+		<?php
 		/* translators: 1: comment date, 2: comment time */
 		$submitted = sprintf(
 			__( '%1$s at %2$s' ),
@@ -209,18 +209,18 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 			get_comment_date( __( 'Y/m/d' ), $comment ),
 			get_comment_date( __( 'g:i a' ), $comment )
 		);
-	if ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) {
-		echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
-	} else {
-		echo $submitted;
-	}
+		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) {
+			echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
+		} else {
+			echo $submitted;
+		}
 		?>
 		</td>
 	</tr>
 	<tr>
 	<th scope="row"><?php /* translators: field name in comment form */ _ex( 'Comment', 'noun' ); ?></th>
 	<td class="comment-content">
-	<?php comment_text( $comment ); ?>
+		<?php comment_text( $comment ); ?>
 	<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
 	</td>
 	</tr>
@@ -229,18 +229,18 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 	<form action="comment.php" method="get" class="comment-ays-submit">
 
 	<p>
-	<?php submit_button( $button, 'primary', 'submit', false ); ?>
+		<?php submit_button( $button, 'primary', 'submit', false ); ?>
 	<a href="<?php echo admin_url( 'edit-comments.php' ); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
 	</p>
 
-	<?php wp_nonce_field( $nonce_action ); ?>
+		<?php wp_nonce_field( $nonce_action ); ?>
 	<input type="hidden" name="action" value="<?php echo esc_attr( $formaction ); ?>" />
 	<input type="hidden" name="c" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
 	<input type="hidden" name="noredir" value="1" />
 	</form>
 
 	</div>
-	<?php
+		<?php
 		break;
 
 	case 'deletecomment':
@@ -290,7 +290,8 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 					array(
 						'trashed' => '1',
 						'ids'     => $comment_id,
-					), $redir
+					),
+					$redir
 				);
 				break;
 			case 'untrashcomment':
@@ -303,7 +304,8 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 					array(
 						'spammed' => '1',
 						'ids'     => $comment_id,
-					), $redir
+					),
+					$redir
 				);
 				break;
 			case 'unspamcomment':
diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index a813897fe9..39282459fd 100644
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -221,28 +221,28 @@ class Custom_Background {
 	 * @since 3.0.0
 	 */
 	public function admin_page() {
-?>
+		?>
 <div class="wrap" id="custom-background">
 <h1><?php _e( 'Custom Background' ); ?></h1>
 
-<?php if ( current_user_can( 'customize' ) ) { ?>
+		<?php if ( current_user_can( 'customize' ) ) { ?>
 <div class="notice notice-info hide-if-no-customize">
 	<p>
-		<?php
-		printf(
-			__( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ),
-			admin_url( 'customize.php?autofocus[control]=background_image' )
-		);
-		?>
+			<?php
+				printf(
+					__( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ),
+					admin_url( 'customize.php?autofocus[control]=background_image' )
+				);
+			?>
 	</p>
 </div>
-<?php } ?>
+		<?php } ?>
 
-<?php if ( ! empty( $this->updated ) ) { ?>
+		<?php if ( ! empty( $this->updated ) ) { ?>
 <div id="message" class="updated">
 <p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
 </div>
-<?php } ?>
+		<?php } ?>
 
 <h3><?php _e( 'Background Image' ); ?></h3>
 
@@ -251,34 +251,34 @@ class Custom_Background {
 <tr>
 <th scope="row"><?php _e( 'Preview' ); ?></th>
 <td>
-	<?php
-	if ( $this->admin_image_div_callback ) {
-		call_user_func( $this->admin_image_div_callback );
-	} else {
-		$background_styles = '';
-		if ( $bgcolor = get_background_color() ) {
-			$background_styles .= 'background-color: #' . $bgcolor . ';';
-		}
+		<?php
+		if ( $this->admin_image_div_callback ) {
+			call_user_func( $this->admin_image_div_callback );
+		} else {
+			$background_styles = '';
+			if ( $bgcolor = get_background_color() ) {
+				$background_styles .= 'background-color: #' . $bgcolor . ';';
+			}
 
-		$background_image_thumb = get_background_image();
-		if ( $background_image_thumb ) {
-			$background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', $background_image_thumb ) ) ) );
-			$background_position_x  = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
-			$background_position_y  = get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) );
-			$background_size        = get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) );
-			$background_repeat      = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
-			$background_attachment  = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
+			$background_image_thumb = get_background_image();
+			if ( $background_image_thumb ) {
+				$background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', $background_image_thumb ) ) ) );
+				$background_position_x  = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
+				$background_position_y  = get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) );
+				$background_size        = get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) );
+				$background_repeat      = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
+				$background_attachment  = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
 
-			// Background-image URL must be single quote, see below.
-			$background_styles .= " background-image: url('$background_image_thumb');"
+				// Background-image URL must be single quote, see below.
+				$background_styles .= " background-image: url('$background_image_thumb');"
 				. " background-size: $background_size;"
 				. " background-position: $background_position_x $background_position_y;"
 				. " background-repeat: $background_repeat;"
 				. " background-attachment: $background_attachment;";
-		}
-	?>
+			}
+			?>
 	<div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
-		<?php if ( $background_image_thumb ) { ?>
+			<?php if ( $background_image_thumb ) { ?>
 		<img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /><br />
 		<img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" />
 		<?php } ?>
@@ -287,34 +287,34 @@ class Custom_Background {
 </td>
 </tr>
 
-<?php if ( get_background_image() ) : ?>
+		<?php if ( get_background_image() ) : ?>
 <tr>
 <th scope="row"><?php _e( 'Remove Image' ); ?></th>
 <td>
 <form method="post">
-<?php wp_nonce_field( 'custom-background-remove', '_wpnonce-custom-background-remove' ); ?>
-<?php submit_button( __( 'Remove Background Image' ), '', 'remove-background', false ); ?><br/>
-<?php _e( 'This will remove the background image. You will not be able to restore any customizations.' ); ?>
+			<?php wp_nonce_field( 'custom-background-remove', '_wpnonce-custom-background-remove' ); ?>
+			<?php submit_button( __( 'Remove Background Image' ), '', 'remove-background', false ); ?><br/>
+			<?php _e( 'This will remove the background image. You will not be able to restore any customizations.' ); ?>
 </form>
 </td>
 </tr>
-<?php endif; ?>
+		<?php endif; ?>
 
-<?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
-<?php if ( $default_image && get_background_image() != $default_image ) : ?>
+		<?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
+		<?php if ( $default_image && get_background_image() != $default_image ) : ?>
 <tr>
 <th scope="row"><?php _e( 'Restore Original Image' ); ?></th>
 <td>
 <form method="post">
-<?php wp_nonce_field( 'custom-background-reset', '_wpnonce-custom-background-reset' ); ?>
-<?php submit_button( __( 'Restore Original Image' ), '', 'reset-background', false ); ?><br/>
-<?php _e( 'This will restore the original background image. You will not be able to restore any customizations.' ); ?>
+			<?php wp_nonce_field( 'custom-background-reset', '_wpnonce-custom-background-reset' ); ?>
+			<?php submit_button( __( 'Restore Original Image' ), '', 'reset-background', false ); ?><br/>
+			<?php _e( 'This will restore the original background image. You will not be able to restore any customizations.' ); ?>
 </form>
 </td>
 </tr>
-<?php endif; ?>
+		<?php endif; ?>
 
-<?php if ( current_user_can( 'upload_files' ) ) : ?>
+		<?php if ( current_user_can( 'upload_files' ) ) : ?>
 <tr>
 <th scope="row"><?php _e( 'Select Image' ); ?></th>
 <td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post">
@@ -322,8 +322,8 @@ class Custom_Background {
 		<label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
-		<?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
-		<?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
+			<?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
+			<?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
 	</p>
 	<p>
 		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
@@ -334,7 +334,7 @@ class Custom_Background {
 	</form>
 </td>
 </tr>
-<?php endif; ?>
+		<?php endif; ?>
 </tbody>
 </table>
 
@@ -342,68 +342,68 @@ class Custom_Background {
 <form method="post">
 <table class="form-table">
 <tbody>
-<?php if ( get_background_image() ) : ?>
+		<?php if ( get_background_image() ) : ?>
 <input name="background-preset" type="hidden" value="custom">
 
-<?php
-$background_position = sprintf(
-	'%s %s',
-	get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ),
-	get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) )
-);
+			<?php
+			$background_position = sprintf(
+				'%s %s',
+				get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ),
+				get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) )
+			);
 
-$background_position_options = array(
-	array(
-		'left top'   => array(
-			'label' => __( 'Top Left' ),
-			'icon'  => 'dashicons dashicons-arrow-left-alt',
-		),
-		'center top' => array(
-			'label' => __( 'Top' ),
-			'icon'  => 'dashicons dashicons-arrow-up-alt',
-		),
-		'right top'  => array(
-			'label' => __( 'Top Right' ),
-			'icon'  => 'dashicons dashicons-arrow-right-alt',
-		),
-	),
-	array(
-		'left center'   => array(
-			'label' => __( 'Left' ),
-			'icon'  => 'dashicons dashicons-arrow-left-alt',
-		),
-		'center center' => array(
-			'label' => __( 'Center' ),
-			'icon'  => 'background-position-center-icon',
-		),
-		'right center'  => array(
-			'label' => __( 'Right' ),
-			'icon'  => 'dashicons dashicons-arrow-right-alt',
-		),
-	),
-	array(
-		'left bottom'   => array(
-			'label' => __( 'Bottom Left' ),
-			'icon'  => 'dashicons dashicons-arrow-left-alt',
-		),
-		'center bottom' => array(
-			'label' => __( 'Bottom' ),
-			'icon'  => 'dashicons dashicons-arrow-down-alt',
-		),
-		'right bottom'  => array(
-			'label' => __( 'Bottom Right' ),
-			'icon'  => 'dashicons dashicons-arrow-right-alt',
-		),
-	),
-);
-?>
+			$background_position_options = array(
+				array(
+					'left top'   => array(
+						'label' => __( 'Top Left' ),
+						'icon'  => 'dashicons dashicons-arrow-left-alt',
+					),
+					'center top' => array(
+						'label' => __( 'Top' ),
+						'icon'  => 'dashicons dashicons-arrow-up-alt',
+					),
+					'right top'  => array(
+						'label' => __( 'Top Right' ),
+						'icon'  => 'dashicons dashicons-arrow-right-alt',
+					),
+				),
+				array(
+					'left center'   => array(
+						'label' => __( 'Left' ),
+						'icon'  => 'dashicons dashicons-arrow-left-alt',
+					),
+					'center center' => array(
+						'label' => __( 'Center' ),
+						'icon'  => 'background-position-center-icon',
+					),
+					'right center'  => array(
+						'label' => __( 'Right' ),
+						'icon'  => 'dashicons dashicons-arrow-right-alt',
+					),
+				),
+				array(
+					'left bottom'   => array(
+						'label' => __( 'Bottom Left' ),
+						'icon'  => 'dashicons dashicons-arrow-left-alt',
+					),
+					'center bottom' => array(
+						'label' => __( 'Bottom' ),
+						'icon'  => 'dashicons dashicons-arrow-down-alt',
+					),
+					'right bottom'  => array(
+						'label' => __( 'Bottom Right' ),
+						'icon'  => 'dashicons dashicons-arrow-right-alt',
+					),
+				),
+			);
+			?>
 <tr>
 <th scope="row"><?php _e( 'Image Position' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Position' ); ?></span></legend>
 <div class="background-position-control">
-<?php foreach ( $background_position_options as $group ) : ?>
+			<?php foreach ( $background_position_options as $group ) : ?>
 	<div class="button-group">
-	<?php foreach ( $group as $value => $input ) : ?>
+				<?php foreach ( $group as $value => $input ) : ?>
 		<label>
 			<input class="screen-reader-text" name="background-position" type="radio" value="<?php echo esc_attr( $value ); ?>"<?php checked( $value, $background_position ); ?>>
 			<span class="button display-options position"><span class="<?php echo esc_attr( $input['icon'] ); ?>" aria-hidden="true"></span></span>
@@ -446,24 +446,24 @@ $background_position_options = array(
 <tr>
 <th scope="row"><?php _e( 'Background Color' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
-<?php
-$default_color = '';
-if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
-	$default_color = ' data-default-color="#' . esc_attr( get_theme_support( 'custom-background', 'default-color' ) ) . '"';
-}
-?>
+		<?php
+		$default_color = '';
+		if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
+			$default_color = ' data-default-color="#' . esc_attr( get_theme_support( 'custom-background', 'default-color' ) ) . '"';
+		}
+		?>
 <input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr( get_background_color() ); ?>"<?php echo $default_color; ?>>
 </fieldset></td>
 </tr>
 </tbody>
 </table>
 
-<?php wp_nonce_field( 'custom-background' ); ?>
-<?php submit_button( null, 'primary', 'save-background-options' ); ?>
+		<?php wp_nonce_field( 'custom-background' ); ?>
+		<?php submit_button( null, 'primary', 'save-background-options' ); ?>
 </form>
 
 </div>
-<?php
+		<?php
 	}
 
 	/**
@@ -581,7 +581,8 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
 		/** This filter is documented in wp-admin/includes/media.php */
 		$sizes = array_keys(
 			apply_filters(
-				'image_size_names_choose', array(
+				'image_size_names_choose',
+				array(
 					'thumbnail' => __( 'Thumbnail' ),
 					'medium'    => __( 'Medium' ),
 					'large'     => __( 'Large' ),
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index 2930dada8f..9460c80ca6 100644
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -380,7 +380,7 @@ class Custom_Image_Header {
 	});
 })(jQuery);
 </script>
-<?php
+		<?php
 	}
 
 	/**
@@ -390,7 +390,7 @@ class Custom_Image_Header {
 	 */
 	public function js_2() {
 
-	?>
+		?>
 <script type="text/javascript">
 	function onEndCrop( coords ) {
 		jQuery( '#x1' ).val(coords.x);
@@ -426,19 +426,19 @@ class Custom_Image_Header {
 			y2: yinit,
 			<?php
 			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
-			?>
+				?>
 			aspectRatio: xinit + ':' + yinit,
-			<?php
+				<?php
 			}
 			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
-			?>
+				?>
 			maxHeight: <?php echo get_theme_support( 'custom-header', 'height' ); ?>,
-			<?php
+				<?php
 			}
 			if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
-			?>
+				?>
 			maxWidth: <?php echo get_theme_support( 'custom-header', 'width' ); ?>,
-			<?php
+				<?php
 			}
 			?>
 			onInit: function () {
@@ -454,7 +454,7 @@ class Custom_Image_Header {
 		});
 	});
 </script>
-<?php
+		<?php
 	}
 
 	/**
@@ -464,153 +464,154 @@ class Custom_Image_Header {
 	 */
 	public function step_1() {
 		$this->process_default_headers();
-?>
+		?>
 
 <div class="wrap">
 <h1><?php _e( 'Custom Header' ); ?></h1>
 
-<?php if ( current_user_can( 'customize' ) ) { ?>
+		<?php if ( current_user_can( 'customize' ) ) { ?>
 <div class="notice notice-info hide-if-no-customize">
 	<p>
-		<?php
-		printf(
-			__( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ),
-			admin_url( 'customize.php?autofocus[control]=header_image' )
-		);
-		?>
+			<?php
+				printf(
+					__( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ),
+					admin_url( 'customize.php?autofocus[control]=header_image' )
+				);
+			?>
 	</p>
 </div>
-<?php } ?>
+		<?php } ?>
 
-<?php if ( ! empty( $this->updated ) ) { ?>
+		<?php if ( ! empty( $this->updated ) ) { ?>
 <div id="message" class="updated">
 <p><?php printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
 </div>
-<?php } ?>
+		<?php } ?>
 
 <h3><?php _e( 'Header Image' ); ?></h3>
 
 <table class="form-table">
 <tbody>
 
-<?php if ( get_custom_header() || display_header_text() ) : ?>
+		<?php if ( get_custom_header() || display_header_text() ) : ?>
 <tr>
 <th scope="row"><?php _e( 'Preview' ); ?></th>
 <td>
-	<?php
-	if ( $this->admin_image_div_callback ) {
-		call_user_func( $this->admin_image_div_callback );
-	} else {
-		$custom_header = get_custom_header();
-		$header_image  = get_header_image();
+			<?php
+			if ( $this->admin_image_div_callback ) {
+				call_user_func( $this->admin_image_div_callback );
+			} else {
+				$custom_header = get_custom_header();
+				$header_image  = get_header_image();
 
-		if ( $header_image ) {
-			$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
-		} else {
-			$header_image_style = '';
-		}
+				if ( $header_image ) {
+					$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
+				} else {
+					$header_image_style = '';
+				}
 
-		if ( $custom_header->width ) {
-			$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-		}
-		if ( $custom_header->height ) {
-			$header_image_style .= 'height:' . $custom_header->height . 'px;';
-		}
-	?>
+				if ( $custom_header->width ) {
+					$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
+				}
+				if ( $custom_header->height ) {
+					$header_image_style .= 'height:' . $custom_header->height . 'px;';
+				}
+				?>
 	<div id="headimg" style="<?php echo $header_image_style; ?>">
-		<?php
-		if ( display_header_text() ) {
-			$style = ' style="color:#' . get_header_textcolor() . ';"';
-		} else {
-			$style = ' style="display:none;"';
-		}
-		?>
+				<?php
+				if ( display_header_text() ) {
+					$style = ' style="color:#' . get_header_textcolor() . ';"';
+				} else {
+					$style = ' style="display:none;"';
+				}
+				?>
 		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo( 'url' ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
 	</div>
-	<?php } ?>
+			<?php } ?>
 </td>
 </tr>
-<?php endif; ?>
+		<?php endif; ?>
 
-<?php if ( current_user_can( 'upload_files' ) && current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
+		<?php if ( current_user_can( 'upload_files' ) && current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
 <tr>
 <th scope="row"><?php _e( 'Select Image' ); ?></th>
 <td>
 	<p><?php _e( 'You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.' ); ?><br />
-	<?php
-	if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
-	} elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
-			printf(
-				/* translators: %s: size in pixels */
-				__( 'Images should be at least %s wide.' ) . ' ',
-				sprintf(
-					/* translators: %d: custom header width */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'width' )
-				)
-			);
-		}
-	} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
-			printf(
-				/* translators: %s: size in pixels */
-				__( 'Images should be at least %s tall.' ) . ' ',
-				sprintf(
-					/* translators: %d: custom header height */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'height' )
-				)
-			);
-		}
-	}
-	if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( current_theme_supports( 'custom-header', 'width' ) ) {
-			printf(
-				/* translators: %s: size in pixels */
-				__( 'Suggested width is %s.' ) . ' ',
-				sprintf(
-					/* translators: %d: custom header width */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'width' )
-				)
-			);
-		}
-		if ( current_theme_supports( 'custom-header', 'height' ) ) {
-			printf(
-				/* translators: %s: size in pixels */
-				__( 'Suggested height is %s.' ) . ' ',
-				sprintf(
-					/* translators: %d: custom header height */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'height' )
-				)
-			);
-		}
-	}
-	?>
+			<?php
+			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+				printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
+			} elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
+				if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					printf(
+						/* translators: %s: size in pixels */
+						__( 'Images should be at least %s wide.' ) . ' ',
+						sprintf(
+							/* translators: %d: custom header width */
+							'<strong>' . __( '%d pixels' ) . '</strong>',
+							get_theme_support( 'custom-header', 'width' )
+						)
+					);
+				}
+			} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
+				if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+					printf(
+						/* translators: %s: size in pixels */
+						__( 'Images should be at least %s tall.' ) . ' ',
+						sprintf(
+							/* translators: %d: custom header height */
+							'<strong>' . __( '%d pixels' ) . '</strong>',
+							get_theme_support( 'custom-header', 'height' )
+						)
+					);
+				}
+			}
+			if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
+				if ( current_theme_supports( 'custom-header', 'width' ) ) {
+					printf(
+						/* translators: %s: size in pixels */
+						__( 'Suggested width is %s.' ) . ' ',
+						sprintf(
+							/* translators: %d: custom header width */
+							'<strong>' . __( '%d pixels' ) . '</strong>',
+							get_theme_support( 'custom-header', 'width' )
+						)
+					);
+				}
+				if ( current_theme_supports( 'custom-header', 'height' ) ) {
+					printf(
+						/* translators: %s: size in pixels */
+						__( 'Suggested height is %s.' ) . ' ',
+						sprintf(
+							/* translators: %d: custom header height */
+							'<strong>' . __( '%d pixels' ) . '</strong>',
+							get_theme_support( 'custom-header', 'height' )
+						)
+					);
+				}
+			}
+			?>
 	</p>
 	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url( add_query_arg( 'step', 2 ) ); ?>">
 	<p>
 		<label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
-		<?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
-		<?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
+			<?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
+			<?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
 	</p>
-	<?php
-		$modal_update_href = esc_url(
-			add_query_arg(
-				array(
-					'page'                          => 'custom-header',
-					'step'                          => 2,
-					'_wpnonce-custom-header-upload' => wp_create_nonce( 'custom-header-upload' ),
-				), admin_url( 'themes.php' )
-			)
-		);
-	?>
+			<?php
+				$modal_update_href = esc_url(
+					add_query_arg(
+						array(
+							'page' => 'custom-header',
+							'step' => 2,
+							'_wpnonce-custom-header-upload' => wp_create_nonce( 'custom-header-upload' ),
+						),
+						admin_url( 'themes.php' )
+					)
+				);
+			?>
 	<p>
 		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
 		<button id="choose-from-library-link" class="button"
@@ -621,36 +622,36 @@ class Custom_Image_Header {
 	</form>
 </td>
 </tr>
-<?php endif; ?>
+		<?php endif; ?>
 </tbody>
 </table>
 
 <form method="post" action="<?php echo esc_url( add_query_arg( 'step', 1 ) ); ?>">
-<?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?>
+		<?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?>
 <table class="form-table">
 <tbody>
-	<?php if ( get_uploaded_header_images() ) : ?>
+		<?php if ( get_uploaded_header_images() ) : ?>
 <tr>
 <th scope="row"><?php _e( 'Uploaded Images' ); ?></th>
 <td>
 	<p><?php _e( 'You can choose one of your previously uploaded headers, or show a random one.' ); ?></p>
-	<?php
-		$this->show_header_selector( 'uploaded' );
-	?>
+			<?php
+			$this->show_header_selector( 'uploaded' );
+			?>
 </td>
 </tr>
-	<?php
+			<?php
 	endif;
 if ( ! empty( $this->default_headers ) ) :
 	?>
 <tr>
 <th scope="row"><?php _e( 'Default Images' ); ?></th>
 <td>
-<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
+	<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
 	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ); ?></p>
-<?php else : ?>
+	<?php else : ?>
 	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ); ?></p>
-<?php endif; ?>
+	<?php endif; ?>
 	<?php
 	$this->show_header_selector( 'default' );
 	?>
@@ -684,7 +685,7 @@ if ( $default_image && get_header_image() != $default_image ) :
 </tbody>
 </table>
 
-<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
+		<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
 
 <h3><?php _e( 'Header Text' ); ?></h3>
 
@@ -703,50 +704,50 @@ if ( $default_image && get_header_image() != $default_image ) :
 <th scope="row"><?php _e( 'Text Color' ); ?></th>
 <td>
 	<p>
-	<?php
-	$default_color = '';
-	if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-		$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-		if ( $default_color && false === strpos( $default_color, '#' ) ) {
-			$default_color = '#' . $default_color;
-		}
-	}
+			<?php
+			$default_color = '';
+			if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
+				$default_color = get_theme_support( 'custom-header', 'default-text-color' );
+				if ( $default_color && false === strpos( $default_color, '#' ) ) {
+					$default_color = '#' . $default_color;
+				}
+			}
 
-	$default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
+			$default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
 
-	$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
-	if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
-		$header_textcolor = '#' . $header_textcolor;
-	}
+			$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
+			if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
+				$header_textcolor = '#' . $header_textcolor;
+			}
 
-	echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
-	if ( $default_color ) {
-		echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
-	}
-	?>
+			echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
+			if ( $default_color ) {
+				echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
+			}
+			?>
 	</p>
 </td>
 </tr>
 </tbody>
 </table>
-<?php
+			<?php
 endif;
 
-/**
- * Fires just before the submit button in the custom header options form.
- *
- * @since 3.1.0
- */
-do_action( 'custom_header_options' );
+		/**
+		 * Fires just before the submit button in the custom header options form.
+		 *
+		 * @since 3.1.0
+		 */
+		do_action( 'custom_header_options' );
 
-wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' );
+		wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' );
 ?>
 
-<?php submit_button( null, 'primary', 'save-header-options' ); ?>
+		<?php submit_button( null, 'primary', 'save-header-options' ); ?>
 </form>
 </div>
 
-<?php
+		<?php
 	}
 
 	/**
@@ -852,18 +853,18 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' );
 	<input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>"/>
 	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $attachment_id ); ?>" />
 	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
-	<?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
+		<?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
 	<input type="hidden" name="create-new-attachment" value="true" />
 	<?php } ?>
-	<?php wp_nonce_field( 'custom-header-crop-image' ); ?>
+		<?php wp_nonce_field( 'custom-header-crop-image' ); ?>
 
 	<p class="submit">
-	<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
-	<?php
-	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
-		submit_button( __( 'Skip Cropping, Publish Image as Is' ), '', 'skip-cropping', false );
-	}
-	?>
+		<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
+		<?php
+		if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
+			submit_button( __( 'Skip Cropping, Publish Image as Is' ), '', 'skip-cropping', false );
+		}
+		?>
 	</p>
 </form>
 </div>
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 677e3dfbb0..6be549ad3a 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -158,7 +158,7 @@ if ( $viewable ) {
 /* translators: Publish box date format, see https://secure.php.net/date */
 $scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) );
 
-$messages['post'] = array(
+$messages['post']       = array(
 	0  => '', // Unused. Messages start at index 1.
 	1  => __( 'Post updated.' ) . $view_post_link_html,
 	2  => __( 'Custom field updated.' ),
@@ -172,7 +172,7 @@ $messages['post'] = array(
 	9  => sprintf( __( 'Post scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_post_link_html,
 	10 => __( 'Post draft updated.' ) . $preview_post_link_html,
 );
-$messages['page'] = array(
+$messages['page']       = array(
 	0  => '', // Unused. Messages start at index 1.
 	1  => __( 'Page updated.' ) . $view_page_link_html,
 	2  => __( 'Custom field updated.' ),
@@ -394,7 +394,8 @@ do_action( 'do_meta_boxes', $post_type, 'advanced', $post );
 do_action( 'do_meta_boxes', $post_type, 'side', $post );
 
 add_screen_option(
-	'layout_columns', array(
+	'layout_columns',
+	array(
 		'max'     => 2,
 		'default' => 2,
 	)
@@ -586,7 +587,7 @@ $referer = wp_get_referer();
 <input type="hidden" id="referredby" name="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
 <?php if ( ! empty( $active_post_lock ) ) { ?>
 <input type="hidden" id="active_post_lock" value="<?php echo esc_attr( implode( ':', $active_post_lock ) ); ?>" />
-<?php
+	<?php
 }
 if ( 'draft' != get_post_status( $post ) ) {
 	wp_original_referer_field( true, 'previous' );
@@ -632,50 +633,50 @@ do_action( 'edit_form_top', $post );
 	<label class="screen-reader-text" id="title-prompt-text" for="title"><?php echo $title_placeholder; ?></label>
 	<input type="text" name="post_title" size="30" value="<?php echo esc_attr( $post->post_title ); ?>" id="title" spellcheck="true" autocomplete="off" />
 </div>
-<?php
-/**
- * Fires before the permalink field in the edit form.
- *
- * @since 4.1.0
- *
- * @param WP_Post $post Post object.
- */
-do_action( 'edit_form_before_permalink', $post );
-?>
+	<?php
+	/**
+	 * Fires before the permalink field in the edit form.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @param WP_Post $post Post object.
+	 */
+	do_action( 'edit_form_before_permalink', $post );
+	?>
 <div class="inside">
-<?php
-if ( $viewable ) :
-	$sample_permalink_html = $post_type_object->public ? get_sample_permalink_html( $post->ID ) : '';
+	<?php
+	if ( $viewable ) :
+		$sample_permalink_html = $post_type_object->public ? get_sample_permalink_html( $post->ID ) : '';
 
-	// As of 4.4, the Get Shortlink button is hidden by default.
-	if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
-		$shortlink = wp_get_shortlink( $post->ID, 'post' );
+		// As of 4.4, the Get Shortlink button is hidden by default.
+		if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
+			$shortlink = wp_get_shortlink( $post->ID, 'post' );
 
-		if ( ! empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url( '?page_id=' . $post->ID ) ) {
-			$sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" /><button type="button" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val());">' . __( 'Get Shortlink' ) . '</button>';
+			if ( ! empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url( '?page_id=' . $post->ID ) ) {
+				$sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" /><button type="button" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val());">' . __( 'Get Shortlink' ) . '</button>';
+			}
 		}
-	}
 
-	if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
-		$has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
-	?>
+		if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
+			$has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
+			?>
 	<div id="edit-slug-box" class="hide-if-no-js">
-	<?php
-	if ( $has_sample_permalink ) {
-		echo $sample_permalink_html;
-	}
-	?>
+			<?php
+			if ( $has_sample_permalink ) {
+				echo $sample_permalink_html;
+			}
+			?>
 	</div>
-	<?php
-	}
+			<?php
+		}
 endif;
-?>
+	?>
 </div>
-<?php
-wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
-?>
+	<?php
+	wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
+	?>
 </div><!-- /titlediv -->
-<?php
+	<?php
 }
 /**
  * Fires after the title field.
@@ -691,48 +692,50 @@ if ( post_type_supports( $post_type, 'editor' ) ) {
 	if ( $_wp_editor_expand ) {
 		$_wp_editor_expand_class = ' wp-editor-expand';
 	}
-?>
+	?>
 <div id="postdivrich" class="postarea<?php echo $_wp_editor_expand_class; ?>">
 
-<?php
-wp_editor(
-	$post->post_content, 'content', array(
-		'_content_editor_dfw' => $_content_editor_dfw,
-		'drag_drop_upload'    => true,
-		'tabfocus_elements'   => 'content-html,save-post',
-		'editor_height'       => 300,
-		'tinymce'             => array(
-			'resize'                  => false,
-			'wp_autoresize_on'        => $_wp_editor_expand,
-			'add_unload_trigger'      => false,
-			'wp_keep_scroll_position' => ! $is_IE,
-		),
-	)
-);
-?>
+	<?php
+	wp_editor(
+		$post->post_content,
+		'content',
+		array(
+			'_content_editor_dfw' => $_content_editor_dfw,
+			'drag_drop_upload'    => true,
+			'tabfocus_elements'   => 'content-html,save-post',
+			'editor_height'       => 300,
+			'tinymce'             => array(
+				'resize'                  => false,
+				'wp_autoresize_on'        => $_wp_editor_expand,
+				'add_unload_trigger'      => false,
+				'wp_keep_scroll_position' => ! $is_IE,
+			),
+		)
+	);
+	?>
 <table id="post-status-info"><tbody><tr>
 	<td id="wp-word-count" class="hide-if-no-js"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
 	<td class="autosave-info">
 	<span class="autosave-message">&nbsp;</span>
-<?php
-if ( 'auto-draft' != $post->post_status ) {
-	echo '<span id="last-edit">';
-	if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {
-		/* translators: 1: Name of most recent post author, 2: Post edited date, 3: Post edited time */
-		printf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
-	} else {
-		/* translators: 1: Post edited date, 2: Post edited time */
-		printf( __( 'Last edited on %1$s at %2$s' ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
+	<?php
+	if ( 'auto-draft' != $post->post_status ) {
+		echo '<span id="last-edit">';
+		if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {
+			/* translators: 1: Name of most recent post author, 2: Post edited date, 3: Post edited time */
+			printf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
+		} else {
+			/* translators: 1: Post edited date, 2: Post edited time */
+			printf( __( 'Last edited on %1$s at %2$s' ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
+		}
+		echo '</span>';
 	}
-	echo '</span>';
-}
 	?>
 	</td>
 	<td id="content-resize-handle" class="hide-if-no-js"><br /></td>
 </tr></tbody></table>
 
 </div>
-<?php
+	<?php
 }
 /**
  * Fires after the content editor.
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 37349ccaef..69dd6911ac 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -26,7 +26,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 <?php
 if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_ID > 0 ) :
 	$comment_link = get_comment_link( $comment );
-?>
+	?>
 <div class="inside">
 	<div id="comment-link-box">
 		<strong><?php _ex( 'Permalink:', 'comment' ); ?></strong>
@@ -72,7 +72,9 @@ if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_
 	echo '<label for="content" class="screen-reader-text">' . __( 'Comment' ) . '</label>';
 	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
 	wp_editor(
-		$comment->comment_content, 'content', array(
+		$comment->comment_content,
+		'content',
+		array(
 			'media_buttons' => false,
 			'tinymce'       => false,
 			'quicktags'     => $quicktags_settings,
@@ -146,7 +148,7 @@ if ( $comment->comment_parent ) :
 	if ( $parent ) :
 		$parent_link = esc_url( get_comment_link( $parent ) );
 		$name        = get_comment_author( $parent );
-	?>
+		?>
 	<div class="misc-pub-section misc-pub-reply-to">
 		<?php
 		printf(
@@ -156,7 +158,7 @@ if ( $comment->comment_parent ) :
 		);
 		?>
 	</div>
-<?php
+		<?php
 endif;
 endif;
 ?>
@@ -226,5 +228,5 @@ $referer = wp_get_referer();
 <script type="text/javascript">
 try{document.post.name.focus();}catch(e){}
 </script>
-<?php
+	<?php
 endif;
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index d0db1df36a..8d7b890457 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -51,7 +51,8 @@ do_action( 'do_meta_boxes', 'link', 'advanced', $link );
 do_action( 'do_meta_boxes', 'link', 'side', $link );
 
 add_screen_option(
-	'layout_columns', array(
+	'layout_columns',
+	array(
 		'max'     => 2,
 		'default' => 2,
 	)
@@ -153,7 +154,7 @@ do_meta_boxes( null, 'advanced', $link );
 <?php
 
 if ( $link_id ) :
-?>
+	?>
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
 <input type="hidden" name="cat_id" value="<?php echo (int) $cat_id; ?>" />
diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index 3e0ce5791a..d9658bbc03 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -77,7 +77,7 @@ do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
 	<p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), admin_url( 'term.php?taxonomy=' . $taxonomy ) ) ); ?>">
 							<?php
 							echo esc_html( $tax->labels->back_to_items );
-	?>
+							?>
 	</a></p>
 	<?php } ?>
 </div>
@@ -284,5 +284,5 @@ do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
 <script type="text/javascript">
 try{document.forms.edittag.name.focus();}catch(e){}
 </script>
-<?php
+	<?php
 endif;
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 2d9ab1dc04..b0827af69a 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -55,7 +55,8 @@ if ( 'post' != $post_type ) {
 }
 
 add_screen_option(
-	'per_page', array(
+	'per_page',
+	array(
 		'default' => 20,
 		'option'  => 'edit_' . $tax->name . '_per_page',
 	)
@@ -95,7 +96,8 @@ switch ( $wp_list_table->current_action() ) {
 				array(
 					'error'   => true,
 					'message' => 4,
-				), $referer
+				),
+				$referer
 			);
 		}
 
@@ -187,7 +189,8 @@ switch ( $wp_list_table->current_action() ) {
 				array(
 					'error'   => true,
 					'message' => 5,
-				), $referer
+				),
+				$referer
 			);
 		}
 		break;
@@ -337,8 +340,8 @@ if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
 
 <?php if ( $message ) : ?>
 <div id="message" class="<?php echo $class; ?> notice is-dismissible"><p><?php echo $message; ?></p></div>
-<?php
-$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message', 'error' ), $_SERVER['REQUEST_URI'] );
+	<?php
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message', 'error' ), $_SERVER['REQUEST_URI'] );
 endif;
 ?>
 <div id="ajax-response"></div>
@@ -401,160 +404,160 @@ if ( current_user_can( $tax->cap->edit_terms ) ) {
 	 * @param string $taxonomy The taxonomy slug.
 	 */
 	do_action( "{$taxonomy}_pre_add_form", $taxonomy );
-?>
+	?>
 
 <div class="form-wrap">
 <h2><?php echo $tax->labels->add_new_item; ?></h2>
 <form id="addtag" method="post" action="edit-tags.php" class="validate"
-<?php
-/**
- * Fires inside the Add Tag form tag.
- *
- * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
- *
- * @since 3.7.0
- */
-do_action( "{$taxonomy}_term_new_form_tag" );
-?>
+	<?php
+	/**
+	 * Fires inside the Add Tag form tag.
+	 *
+	 * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
+	 *
+	 * @since 3.7.0
+	 */
+	do_action( "{$taxonomy}_term_new_form_tag" );
+	?>
 >
 <input type="hidden" name="action" value="add-tag" />
 <input type="hidden" name="screen" value="<?php echo esc_attr( $current_screen->id ); ?>" />
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ); ?>" />
 <input type="hidden" name="post_type" value="<?php echo esc_attr( $post_type ); ?>" />
-<?php wp_nonce_field( 'add-tag', '_wpnonce_add-tag' ); ?>
+	<?php wp_nonce_field( 'add-tag', '_wpnonce_add-tag' ); ?>
 
 <div class="form-field form-required term-name-wrap">
 	<label for="tag-name"><?php _ex( 'Name', 'term name' ); ?></label>
 	<input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
 	<p><?php _e( 'The name is how it appears on your site.' ); ?></p>
 </div>
-<?php if ( ! global_terms_enabled() ) : ?>
+	<?php if ( ! global_terms_enabled() ) : ?>
 <div class="form-field term-slug-wrap">
 	<label for="tag-slug"><?php _e( 'Slug' ); ?></label>
 	<input name="slug" id="tag-slug" type="text" value="" size="40" />
 	<p><?php _e( 'The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ); ?></p>
 </div>
 <?php endif; // global_terms_enabled() ?>
-<?php if ( is_taxonomy_hierarchical( $taxonomy ) ) : ?>
+	<?php if ( is_taxonomy_hierarchical( $taxonomy ) ) : ?>
 <div class="form-field term-parent-wrap">
 	<label for="parent"><?php echo esc_html( $tax->labels->parent_item ); ?></label>
-	<?php
-	$dropdown_args = array(
-		'hide_empty'       => 0,
-		'hide_if_empty'    => false,
-		'taxonomy'         => $taxonomy,
-		'name'             => 'parent',
-		'orderby'          => 'name',
-		'hierarchical'     => true,
-		'show_option_none' => __( 'None' ),
-	);
+		<?php
+		$dropdown_args = array(
+			'hide_empty'       => 0,
+			'hide_if_empty'    => false,
+			'taxonomy'         => $taxonomy,
+			'name'             => 'parent',
+			'orderby'          => 'name',
+			'hierarchical'     => true,
+			'show_option_none' => __( 'None' ),
+		);
 
-	/**
-	 * Filters the taxonomy parent drop-down on the Edit Term page.
-	 *
-	 * @since 3.7.0
-	 * @since 4.2.0 Added `$context` parameter.
-	 *
-	 * @param array  $dropdown_args {
-	 *     An array of taxonomy parent drop-down arguments.
-	 *
-	 *     @type int|bool $hide_empty       Whether to hide terms not attached to any posts. Default 0|false.
-	 *     @type bool     $hide_if_empty    Whether to hide the drop-down if no terms exist. Default false.
-	 *     @type string   $taxonomy         The taxonomy slug.
-	 *     @type string   $name             Value of the name attribute to use for the drop-down select element.
-	 *                                      Default 'parent'.
-	 *     @type string   $orderby          The field to order by. Default 'name'.
-	 *     @type bool     $hierarchical     Whether the taxonomy is hierarchical. Default true.
-	 *     @type string   $show_option_none Label to display if there are no terms. Default 'None'.
-	 * }
-	 * @param string $taxonomy The taxonomy slug.
-	 * @param string $context  Filter context. Accepts 'new' or 'edit'.
-	 */
-	$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' );
+		/**
+		 * Filters the taxonomy parent drop-down on the Edit Term page.
+		 *
+		 * @since 3.7.0
+		 * @since 4.2.0 Added `$context` parameter.
+		 *
+		 * @param array  $dropdown_args {
+		 *     An array of taxonomy parent drop-down arguments.
+		 *
+		 *     @type int|bool $hide_empty       Whether to hide terms not attached to any posts. Default 0|false.
+		 *     @type bool     $hide_if_empty    Whether to hide the drop-down if no terms exist. Default false.
+		 *     @type string   $taxonomy         The taxonomy slug.
+		 *     @type string   $name             Value of the name attribute to use for the drop-down select element.
+		 *                                      Default 'parent'.
+		 *     @type string   $orderby          The field to order by. Default 'name'.
+		 *     @type bool     $hierarchical     Whether the taxonomy is hierarchical. Default true.
+		 *     @type string   $show_option_none Label to display if there are no terms. Default 'None'.
+		 * }
+		 * @param string $taxonomy The taxonomy slug.
+		 * @param string $context  Filter context. Accepts 'new' or 'edit'.
+		 */
+		$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' );
 
-	wp_dropdown_categories( $dropdown_args );
-	?>
-	<?php if ( 'category' == $taxonomy ) : ?>
+		wp_dropdown_categories( $dropdown_args );
+		?>
+		<?php if ( 'category' == $taxonomy ) : ?>
 		<p><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
 	<?php else : ?>
 		<p><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); ?></p>
 	<?php endif; ?>
 </div>
-<?php endif; // is_taxonomy_hierarchical() ?>
+	<?php endif; // is_taxonomy_hierarchical() ?>
 <div class="form-field term-description-wrap">
 	<label for="tag-description"><?php _e( 'Description' ); ?></label>
 	<textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
 	<p><?php _e( 'The description is not prominent by default; however, some themes may show it.' ); ?></p>
 </div>
 
-<?php
-if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
+	<?php
+	if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
+		/**
+		 * Fires after the Add Tag form fields for non-hierarchical taxonomies.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param string $taxonomy The taxonomy slug.
+		 */
+		do_action( 'add_tag_form_fields', $taxonomy );
+	}
+
 	/**
-	 * Fires after the Add Tag form fields for non-hierarchical taxonomies.
+	 * Fires after the Add Term form fields.
+	 *
+	 * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
 	 *
 	 * @since 3.0.0
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( 'add_tag_form_fields', $taxonomy );
-}
+	do_action( "{$taxonomy}_add_form_fields", $taxonomy );
 
-/**
- * Fires after the Add Term form fields.
- *
- * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
- *
- * @since 3.0.0
- *
- * @param string $taxonomy The taxonomy slug.
- */
-do_action( "{$taxonomy}_add_form_fields", $taxonomy );
+	submit_button( $tax->labels->add_new_item );
 
-submit_button( $tax->labels->add_new_item );
+	if ( 'category' == $taxonomy ) {
+		/**
+		 * Fires at the end of the Edit Category form.
+		 *
+		 * @since 2.1.0
+		 * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+		 *
+		 * @param object $arg Optional arguments cast to an object.
+		 */
+		do_action( 'edit_category_form', (object) array( 'parent' => 0 ) );
+	} elseif ( 'link_category' == $taxonomy ) {
+		/**
+		 * Fires at the end of the Edit Link form.
+		 *
+		 * @since 2.3.0
+		 * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+		 *
+		 * @param object $arg Optional arguments cast to an object.
+		 */
+		do_action( 'edit_link_category_form', (object) array( 'parent' => 0 ) );
+	} else {
+		/**
+		 * Fires at the end of the Add Tag form.
+		 *
+		 * @since 2.7.0
+		 * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+		 *
+		 * @param string $taxonomy The taxonomy slug.
+		 */
+		do_action( 'add_tag_form', $taxonomy );
+	}
 
-if ( 'category' == $taxonomy ) {
 	/**
-	 * Fires at the end of the Edit Category form.
+	 * Fires at the end of the Add Term form for all taxonomies.
 	 *
-	 * @since 2.1.0
-	 * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+	 * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
 	 *
-	 * @param object $arg Optional arguments cast to an object.
-	 */
-	do_action( 'edit_category_form', (object) array( 'parent' => 0 ) );
-} elseif ( 'link_category' == $taxonomy ) {
-	/**
-	 * Fires at the end of the Edit Link form.
-	 *
-	 * @since 2.3.0
-	 * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
-	 *
-	 * @param object $arg Optional arguments cast to an object.
-	 */
-	do_action( 'edit_link_category_form', (object) array( 'parent' => 0 ) );
-} else {
-	/**
-	 * Fires at the end of the Add Tag form.
-	 *
-	 * @since 2.7.0
-	 * @deprecated 3.0.0 Use {$taxonomy}_add_form instead.
+	 * @since 3.0.0
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( 'add_tag_form', $taxonomy );
-}
-
-/**
- * Fires at the end of the Add Term form for all taxonomies.
- *
- * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
- *
- * @since 3.0.0
- *
- * @param string $taxonomy The taxonomy slug.
- */
-do_action( "{$taxonomy}_add_form", $taxonomy );
-?>
+	do_action( "{$taxonomy}_add_form", $taxonomy );
+	?>
 </form></div>
 <?php } ?>
 
@@ -587,15 +590,15 @@ do_action( "{$taxonomy}_add_form", $taxonomy );
 	);
 	?>
 </p>
-<?php if ( current_user_can( 'import' ) ) : ?>
+	<?php if ( current_user_can( 'import' ) ) : ?>
 <p><?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ); ?></p>
-<?php endif; ?>
+	<?php endif; ?>
 </div>
 <?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
 <div class="form-wrap edit-term-notes">
 <p><?php printf( __( 'Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.' ), esc_url( $import_link ) ); ?></p>
 </div>
-<?php
+	<?php
 endif;
 
 /**
@@ -620,7 +623,7 @@ do_action( "after-{$taxonomy}-table", $taxonomy );
 <script type="text/javascript">
 try{document.forms.addtag['tag-name'].focus();}catch(e){}
 </script>
-<?php
+	<?php
 endif;
 
 $wp_list_table->inline_edit();
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index b1ad058912..24a02d05b1 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -127,7 +127,8 @@ if ( $doaction ) {
 					'trashed' => $trashed,
 					'ids'     => join( ',', $post_ids ),
 					'locked'  => $locked,
-				), $sendback
+				),
+				$sendback
 			);
 			break;
 		case 'untrash':
@@ -290,7 +291,8 @@ get_current_screen()->set_screen_reader_content(
 );
 
 add_screen_option(
-	'per_page', array(
+	'per_page',
+	array(
 		'default' => 20,
 		'option'  => 'edit_' . $post_type . '_per_page',
 	)
diff --git a/wp-admin/export.php b/wp-admin/export.php
index 89e5d34da6..cb088bafc2 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -23,7 +23,7 @@ $title = __( 'Export' );
  * @since 3.5.0
  */
 function export_add_js() {
-?>
+	?>
 <script type="text/javascript">
 	jQuery(document).ready(function($){
 		 var form = $('#export-filters'),
@@ -39,7 +39,7 @@ function export_add_js() {
 		 });
 	});
 </script>
-<?php
+	<?php
 }
 add_action( 'admin_head', 'export_add_js' );
 
@@ -144,7 +144,8 @@ function export_date_options( $post_type = 'post' ) {
 		FROM $wpdb->posts
 		WHERE post_type = %s AND post_status != 'auto-draft'
 		ORDER BY post_date DESC
-	", $post_type
+	",
+			$post_type
 		)
 	);
 
@@ -224,7 +225,7 @@ function export_date_options( $post_type = 'post' ) {
 			<?php
 			$post_stati = get_post_stati( array( 'internal' => false ), 'objects' );
 			foreach ( $post_stati as $status ) :
-			?>
+				?>
 			<option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
 			<?php endforeach; ?>
 		</select>
@@ -280,9 +281,10 @@ foreach ( get_post_types(
 	array(
 		'_builtin'   => false,
 		'can_export' => true,
-	), 'objects'
+	),
+	'objects'
 ) as $post_type ) :
-?>
+	?>
 <p><label><input type="radio" name="content" value="<?php echo esc_attr( $post_type->name ); ?>" /> <?php echo esc_html( $post_type->label ); ?></label></p>
 <?php endforeach; ?>
 
diff --git a/wp-admin/import.php b/wp-admin/import.php
index 48051c940e..0877d1e581 100644
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -65,7 +65,7 @@ $parent_file = 'tools.php';
 								<?php
 								/* translators: %s: importer slug */
 								printf( __( 'The %s importer is invalid or is not installed.' ), '<strong>' . esc_html( $_GET['invalid'] ) . '</strong>' );
-		?>
+								?>
 		</p>
 	</div>
 <?php endif; ?>
@@ -96,7 +96,7 @@ if ( empty( $importers ) ) {
 	echo '<p>' . __( 'No importers are available.' ) . '</p>'; // TODO: make more helpful
 } else {
 	uasort( $importers, '_usort_by_first_member' );
-?>
+	?>
 <table class="widefat importers striped">
 
 	<?php
@@ -119,8 +119,10 @@ if ( empty( $importers ) ) {
 								'action' => 'activate',
 								'plugin' => $plugin_file,
 								'from'   => 'import',
-							), admin_url( 'plugins.php' )
-						), 'activate-plugin_' . $plugin_file
+							),
+							admin_url( 'plugins.php' )
+						),
+						'activate-plugin_' . $plugin_file
 					);
 					$action      = sprintf(
 						'<a href="%s" aria-label="%s">%s</a>',
@@ -142,8 +144,10 @@ if ( empty( $importers ) ) {
 								'action' => 'install-plugin',
 								'plugin' => $plugin_slug,
 								'from'   => 'import',
-							), self_admin_url( 'update.php' )
-						), 'install-plugin_' . $plugin_slug
+							),
+							self_admin_url( 'update.php' )
+						),
+						'install-plugin_' . $plugin_slug
 					);
 					$action = sprintf(
 						'<a href="%1$s" class="install-now" data-slug="%2$s" data-name="%3$s" aria-label="%4$s">%5$s</a>',
@@ -166,7 +170,8 @@ if ( empty( $importers ) ) {
 			$url    = add_query_arg(
 				array(
 					'import' => $importer_id,
-				), self_admin_url( 'admin.php' )
+				),
+				self_admin_url( 'admin.php' )
 			);
 			$action = sprintf(
 				'<a href="%1$s" aria-label="%2$s">%3$s</a>',
@@ -188,7 +193,8 @@ if ( empty( $importers ) ) {
 					'TB_iframe' => 'true',
 					'width'     => 600,
 					'height'    => 550,
-				), network_admin_url( 'plugin-install.php' )
+				),
+				network_admin_url( 'plugin-install.php' )
 			);
 			$action .= sprintf(
 				' | <a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
@@ -212,7 +218,7 @@ if ( empty( $importers ) ) {
 	}
 	?>
 </table>
-<?php
+	<?php
 }
 
 if ( current_user_can( 'install_plugins' ) ) {
diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php
index 04c31e51d3..f3c54284a0 100644
--- a/wp-admin/includes/ajax-actions.php
+++ b/wp-admin/includes/ajax-actions.php
@@ -514,7 +514,8 @@ function _wp_ajax_add_hierarchical_term() {
 		ob_start();
 
 		wp_terms_checklist(
-			0, array(
+			0,
+			array(
 				'taxonomy'             => $taxonomy->name,
 				'descendants_and_self' => $cat_id,
 				'selected_cats'        => $checked_categories,
@@ -547,7 +548,8 @@ function _wp_ajax_add_hierarchical_term() {
 		ob_start();
 
 		wp_terms_checklist(
-			0, array(
+			0,
+			array(
 				'taxonomy'             => $taxonomy->name,
 				'descendants_and_self' => $term_id,
 				'selected_cats'        => $checked_categories,
@@ -998,7 +1000,8 @@ function wp_ajax_get_tagcloud() {
 	}
 
 	$tags = get_terms(
-		$taxonomy, array(
+		$taxonomy,
+		array(
 			'number'  => 45,
 			'orderby' => 'count',
 			'order'   => 'DESC',
@@ -1020,7 +1023,8 @@ function wp_ajax_get_tagcloud() {
 
 	// We need raw tag names here, so don't filter the output
 	$return = wp_generate_tag_cloud(
-		$tags, array(
+		$tags,
+		array(
 			'filter' => 0,
 			'format' => 'list',
 		)
@@ -1460,7 +1464,8 @@ function wp_ajax_add_meta() {
 						'meta_key'   => $key,
 						'meta_value' => $value,
 						'meta_id'    => $mid,
-					), $c
+					),
+					$c
 				),
 				'position'     => 0,
 				'supplemental' => array( 'postid' => $meta->post_id ),
@@ -1625,7 +1630,8 @@ function wp_ajax_menu_get_metabox() {
 		$item = apply_filters( 'nav_menu_meta_box_object', $menus_meta_box_object );
 		ob_start();
 		call_user_func_array(
-			$callback, array(
+			$callback,
+			array(
 				null,
 				array(
 					'id'       => 'add-' . $item->name,
@@ -3166,7 +3172,8 @@ function wp_ajax_query_themes() {
 	}
 
 	$args = wp_parse_args(
-		wp_unslash( $_REQUEST['request'] ), array(
+		wp_unslash( $_REQUEST['request'] ),
+		array(
 			'per_page' => 20,
 			'fields'   => $theme_field_defaults,
 		)
@@ -3196,7 +3203,8 @@ function wp_ajax_query_themes() {
 			array(
 				'theme'    => $theme->slug,
 				'_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug ),
-			), $update_php
+			),
+			$update_php
 		);
 
 		if ( current_user_can( 'switch_themes' ) ) {
@@ -3206,7 +3214,8 @@ function wp_ajax_query_themes() {
 						'action'   => 'enable',
 						'_wpnonce' => wp_create_nonce( 'enable-theme_' . $theme->slug ),
 						'theme'    => $theme->slug,
-					), network_admin_url( 'themes.php' )
+					),
+					network_admin_url( 'themes.php' )
 				);
 			} else {
 				$theme->activate_url = add_query_arg(
@@ -3214,7 +3223,8 @@ function wp_ajax_query_themes() {
 						'action'     => 'activate',
 						'_wpnonce'   => wp_create_nonce( 'switch-theme_' . $theme->slug ),
 						'stylesheet' => $theme->slug,
-					), admin_url( 'themes.php' )
+					),
+					admin_url( 'themes.php' )
 				);
 			}
 		}
@@ -3223,7 +3233,8 @@ function wp_ajax_query_themes() {
 			$theme->customize_url = add_query_arg(
 				array(
 					'return' => urlencode( network_admin_url( 'theme-install.php', 'relative' ) ),
-				), wp_customize_url( $theme->slug )
+				),
+				wp_customize_url( $theme->slug )
 			);
 		}
 
@@ -3666,7 +3677,8 @@ function wp_ajax_install_theme() {
 	include_once( ABSPATH . 'wp-admin/includes/theme.php' );
 
 	$api = themes_api(
-		'theme_information', array(
+		'theme_information',
+		array(
 			'slug'   => $slug,
 			'fields' => array( 'sections' => false ),
 		)
@@ -3719,7 +3731,8 @@ function wp_ajax_install_theme() {
 					'action'   => 'enable',
 					'_wpnonce' => wp_create_nonce( 'enable-theme_' . $slug ),
 					'theme'    => $slug,
-				), network_admin_url( 'themes.php' )
+				),
+				network_admin_url( 'themes.php' )
 			);
 		} else {
 			$status['activateUrl'] = add_query_arg(
@@ -3727,7 +3740,8 @@ function wp_ajax_install_theme() {
 					'action'     => 'activate',
 					'_wpnonce'   => wp_create_nonce( 'switch-theme_' . $slug ),
 					'stylesheet' => $slug,
-				), admin_url( 'themes.php' )
+				),
+				admin_url( 'themes.php' )
 			);
 		}
 	}
@@ -3736,7 +3750,8 @@ function wp_ajax_install_theme() {
 		$status['customizeUrl'] = add_query_arg(
 			array(
 				'return' => urlencode( network_admin_url( 'theme-install.php', 'relative' ) ),
-			), wp_customize_url( $slug )
+			),
+			wp_customize_url( $slug )
 		);
 	}
 
@@ -3950,7 +3965,8 @@ function wp_ajax_install_plugin() {
 	include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
 
 	$api = plugins_api(
-		'plugin_information', array(
+		'plugin_information',
+		array(
 			'slug'   => sanitize_key( wp_unslash( $_POST['slug'] ) ),
 			'fields' => array(
 				'sections' => false,
@@ -4010,7 +4026,8 @@ function wp_ajax_install_plugin() {
 				'_wpnonce' => wp_create_nonce( 'activate-plugin_' . $install_status['file'] ),
 				'action'   => 'activate',
 				'plugin'   => $install_status['file'],
-			), $plugins_url
+			),
+			$plugins_url
 		);
 	}
 
@@ -4220,7 +4237,8 @@ function wp_ajax_search_plugins() {
 
 	/** @var WP_Plugins_List_Table $wp_list_table */
 	$wp_list_table = _get_list_table(
-		'WP_Plugins_List_Table', array(
+		'WP_Plugins_List_Table',
+		array(
 			'screen' => get_current_screen(),
 		)
 	);
@@ -4235,11 +4253,13 @@ function wp_ajax_search_plugins() {
 	// Set the correct requester, so pagination works.
 	$_SERVER['REQUEST_URI'] = add_query_arg(
 		array_diff_key(
-			$_POST, array(
+			$_POST,
+			array(
 				'_ajax_nonce' => null,
 				'action'      => null,
 			)
-		), network_admin_url( 'plugins.php', 'relative' )
+		),
+		network_admin_url( 'plugins.php', 'relative' )
 	);
 
 	$GLOBALS['s'] = wp_unslash( $_POST['s'] );
@@ -4269,7 +4289,8 @@ function wp_ajax_search_install_plugins() {
 
 	/** @var WP_Plugin_Install_List_Table $wp_list_table */
 	$wp_list_table = _get_list_table(
-		'WP_Plugin_Install_List_Table', array(
+		'WP_Plugin_Install_List_Table',
+		array(
 			'screen' => get_current_screen(),
 		)
 	);
@@ -4284,11 +4305,13 @@ function wp_ajax_search_install_plugins() {
 	// Set the correct requester, so pagination works.
 	$_SERVER['REQUEST_URI'] = add_query_arg(
 		array_diff_key(
-			$_POST, array(
+			$_POST,
+			array(
 				'_ajax_nonce' => null,
 				'action'      => null,
 			)
-		), network_admin_url( 'plugin-install.php', 'relative' )
+		),
+		network_admin_url( 'plugin-install.php', 'relative' )
 	);
 
 	$wp_list_table->prepare_items();
diff --git a/wp-admin/includes/class-automatic-upgrader-skin.php b/wp-admin/includes/class-automatic-upgrader-skin.php
index 571068d691..5f8360f066 100644
--- a/wp-admin/includes/class-automatic-upgrader-skin.php
+++ b/wp-admin/includes/class-automatic-upgrader-skin.php
@@ -83,7 +83,8 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
 
 		// Only allow basic HTML in the messages, as it'll be used in emails/logs rather than direct browser output.
 		$string = wp_kses(
-			$string, array(
+			$string,
+			array(
 				'a'      => array(
 					'href' => true,
 				),
diff --git a/wp-admin/includes/class-core-upgrader.php b/wp-admin/includes/class-core-upgrader.php
index f39c300be1..58daba77ea 100644
--- a/wp-admin/includes/class-core-upgrader.php
+++ b/wp-admin/includes/class-core-upgrader.php
@@ -180,7 +180,9 @@ class Core_Upgrader extends WP_Upgrader {
 
 				$original_result = $result;
 				$result          = new WP_Error(
-					'rollback_was_required', $this->strings['rollback_was_required'], (object) array(
+					'rollback_was_required',
+					$this->strings['rollback_was_required'],
+					(object) array(
 						'update'   => $original_result,
 						'rollback' => $rollback_result,
 					)
@@ -189,10 +191,14 @@ class Core_Upgrader extends WP_Upgrader {
 		}
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
-		do_action( 'upgrader_process_complete', $this, array(
-			'action' => 'update',
-			'type'   => 'core',
-		) );
+		do_action(
+			'upgrader_process_complete',
+			$this,
+			array(
+				'action' => 'update',
+				'type'   => 'core',
+			)
+		);
 
 		// Clear the current updates
 		delete_site_transient( 'update_core' );
diff --git a/wp-admin/includes/class-language-pack-upgrader.php b/wp-admin/includes/class-language-pack-upgrader.php
index 8e808608fa..3982306aec 100644
--- a/wp-admin/includes/class-language-pack-upgrader.php
+++ b/wp-admin/includes/class-language-pack-upgrader.php
@@ -275,12 +275,16 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 		remove_action( 'upgrader_process_complete', 'wp_update_themes' );
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
-		do_action( 'upgrader_process_complete', $this, array(
-			'action'       => 'update',
-			'type'         => 'translation',
-			'bulk'         => true,
-			'translations' => $language_updates_results,
-		) );
+		do_action(
+			'upgrader_process_complete',
+			$this,
+			array(
+				'action'       => 'update',
+				'type'         => 'translation',
+				'bulk'         => true,
+				'translations' => $language_updates_results,
+			)
+		);
 
 		// Re-add upgrade hooks.
 		add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
@@ -337,7 +341,8 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 
 		if ( ! $mo || ! $po ) {
 			return new WP_Error(
-				'incompatible_archive_pomo', $this->strings['incompatible_archive'],
+				'incompatible_archive_pomo',
+				$this->strings['incompatible_archive'],
 				/* translators: 1: .po, 2: .mo */
 				sprintf(
 					__( 'The language pack is missing either the %1$s or %2$s files.' ),
diff --git a/wp-admin/includes/class-plugin-upgrader.php b/wp-admin/includes/class-plugin-upgrader.php
index bd00b7283f..c80c9c4c97 100644
--- a/wp-admin/includes/class-plugin-upgrader.php
+++ b/wp-admin/includes/class-plugin-upgrader.php
@@ -306,12 +306,16 @@ class Plugin_Upgrader extends WP_Upgrader {
 		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
-		do_action( 'upgrader_process_complete', $this, array(
-			'action'  => 'update',
-			'type'    => 'plugin',
-			'bulk'    => true,
-			'plugins' => $plugins,
-		) );
+		do_action(
+			'upgrader_process_complete',
+			$this,
+			array(
+				'action'  => 'update',
+				'type'    => 'plugin',
+				'bulk'    => true,
+				'plugins' => $plugins,
+			)
+		);
 
 		$this->skin->bulk_footer();
 
diff --git a/wp-admin/includes/class-theme-installer-skin.php b/wp-admin/includes/class-theme-installer-skin.php
index 9d1a7993f8..cf8ee0d88a 100644
--- a/wp-admin/includes/class-theme-installer-skin.php
+++ b/wp-admin/includes/class-theme-installer-skin.php
@@ -67,7 +67,8 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 				'action'     => 'activate',
 				'template'   => urlencode( $template ),
 				'stylesheet' => urlencode( $stylesheet ),
-			), admin_url( 'themes.php' )
+			),
+			admin_url( 'themes.php' )
 		);
 		$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
 
diff --git a/wp-admin/includes/class-theme-upgrader-skin.php b/wp-admin/includes/class-theme-upgrader-skin.php
index 68569321b6..395429620f 100644
--- a/wp-admin/includes/class-theme-upgrader-skin.php
+++ b/wp-admin/includes/class-theme-upgrader-skin.php
@@ -51,7 +51,8 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 					'action'     => 'activate',
 					'template'   => urlencode( $template ),
 					'stylesheet' => urlencode( $stylesheet ),
-				), admin_url( 'themes.php' )
+				),
+				admin_url( 'themes.php' )
 			);
 			$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
 
diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php
index 1a561ab69c..eec26d5e0e 100644
--- a/wp-admin/includes/class-theme-upgrader.php
+++ b/wp-admin/includes/class-theme-upgrader.php
@@ -111,7 +111,8 @@ class Theme_Upgrader extends WP_Upgrader {
 
 		// We don't have the parent theme, let's install it.
 		$api = themes_api(
-			'theme_information', array(
+			'theme_information',
+			array(
 				'slug'   => $theme_info->get( 'Template' ),
 				'fields' => array(
 					'sections' => false,
@@ -418,7 +419,9 @@ class Theme_Upgrader extends WP_Upgrader {
 
 		/** This action is documented in wp-admin/includes/class-wp-upgrader.php */
 		do_action(
-			'upgrader_process_complete', $this, array(
+			'upgrader_process_complete',
+			$this,
+			array(
 				'action' => 'update',
 				'type'   => 'theme',
 				'bulk'   => true,
@@ -468,7 +471,8 @@ class Theme_Upgrader extends WP_Upgrader {
 		// A proper archive should have a style.css file in the single subdirectory
 		if ( ! file_exists( $working_directory . 'style.css' ) ) {
 			return new WP_Error(
-				'incompatible_archive_theme_no_style', $this->strings['incompatible_archive'],
+				'incompatible_archive_theme_no_style',
+				$this->strings['incompatible_archive'],
 				/* translators: %s: style.css */
 				sprintf(
 					__( 'The theme is missing the %s stylesheet.' ),
@@ -478,7 +482,8 @@ class Theme_Upgrader extends WP_Upgrader {
 		}
 
 		$info = get_file_data(
-			$working_directory . 'style.css', array(
+			$working_directory . 'style.css',
+			array(
 				'Name'     => 'Theme Name',
 				'Template' => 'Template',
 			)
@@ -486,7 +491,8 @@ class Theme_Upgrader extends WP_Upgrader {
 
 		if ( empty( $info['Name'] ) ) {
 			return new WP_Error(
-				'incompatible_archive_theme_no_name', $this->strings['incompatible_archive'],
+				'incompatible_archive_theme_no_name',
+				$this->strings['incompatible_archive'],
 				/* translators: %s: style.css */
 				sprintf(
 					__( 'The %s stylesheet doesn&#8217;t contain a valid theme header.' ),
@@ -498,7 +504,8 @@ class Theme_Upgrader extends WP_Upgrader {
 		// If it's not a child theme, it must have at least an index.php to be legit.
 		if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) ) {
 			return new WP_Error(
-				'incompatible_archive_theme_no_index', $this->strings['incompatible_archive'],
+				'incompatible_archive_theme_no_index',
+				$this->strings['incompatible_archive'],
 				/* translators: %s: index.php */
 				sprintf(
 					__( 'The theme is missing the %s file.' ),
diff --git a/wp-admin/includes/class-walker-nav-menu-edit.php b/wp-admin/includes/class-walker-nav-menu-edit.php
index d53c0c8988..f1baecd611 100644
--- a/wp-admin/includes/class-walker-nav-menu-edit.php
+++ b/wp-admin/includes/class-walker-nav-menu-edit.php
@@ -152,7 +152,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 						<a class="item-edit" id="edit-<?php echo $item_id; ?>" href="
 																	<?php
 																	echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
-						?>
+																	?>
 						" aria-label="<?php esc_attr_e( 'Edit menu item' ); ?>"><span class="screen-reader-text"><?php _e( 'Edit' ); ?></span></a>
 					</span>
 				</div>
@@ -232,7 +232,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 																							),
 																							'delete-menu_item_' . $item_id
 																						);
-					?>
+																						?>
 					"><?php _e( 'Remove' ); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="
 					<?php
 					echo esc_url(
@@ -240,10 +240,11 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 							array(
 								'edit-menu-item' => $item_id,
 								'cancel'         => time(),
-							), admin_url( 'nav-menus.php' )
+							),
+							admin_url( 'nav-menus.php' )
 						)
 					);
-						?>
+					?>
 						#menu-item-settings-<?php echo $item_id; ?>"><?php _e( 'Cancel' ); ?></a>
 				</div>
 
diff --git a/wp-admin/includes/class-wp-automatic-updater.php b/wp-admin/includes/class-wp-automatic-updater.php
index 59b16a59e8..f999ff24ed 100644
--- a/wp-admin/includes/class-wp-automatic-updater.php
+++ b/wp-admin/includes/class-wp-automatic-updater.php
@@ -336,7 +336,8 @@ class WP_Automatic_Updater {
 
 		// Boom, This sites about to get a whole new splash of paint!
 		$upgrade_result = $upgrader->upgrade(
-			$upgrader_item, array(
+			$upgrader_item,
+			array(
 				'clear_update_cache'           => false,
 				// Always use partial builds if possible for core updates.
 				'pre_check_md5'                => false,
@@ -574,7 +575,8 @@ class WP_Automatic_Updater {
 		}
 
 		update_site_option(
-			'auto_core_update_failed', array(
+			'auto_core_update_failed',
+			array(
 				'attempted'  => $core_update->current,
 				'current'    => $wp_version,
 				'error_code' => $error_code,
@@ -600,7 +602,8 @@ class WP_Automatic_Updater {
 	 */
 	protected function send_email( $type, $core_update, $result = null ) {
 		update_site_option(
-			'auto_core_update_notified', array(
+			'auto_core_update_notified',
+			array(
 				'type'      => $type,
 				'email'     => get_site_option( 'admin_email' ),
 				'version'   => $core_update->current,
diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index 7ab35735a7..7d2068fc49 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -158,7 +158,8 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 		$total_comments = get_comments(
 			array_merge(
-				$args, array(
+				$args,
+				array(
 					'count'  => true,
 					'offset' => 0,
 					'number' => 0,
@@ -224,7 +225,7 @@ class WP_Comments_List_Table extends WP_List_Table {
 			), // singular not used
 
 			/* translators: %s: current user's comments count */
-			'mine' => _nx_noop(
+			'mine'      => _nx_noop(
 				'Mine <span class="count">(%s)</span>',
 				'Mine <span class="count">(%s)</span>',
 				'comments'
@@ -277,11 +278,13 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 			if ( 'mine' === $status ) {
 				$current_user_id    = get_current_user_id();
-				$num_comments->mine = get_comments( array(
-					'user_id' => $current_user_id,
-					'count'   => true,
-				) );
-				$link = add_query_arg( 'user_id', $current_user_id, $link );
+				$num_comments->mine = get_comments(
+					array(
+						'user_id' => $current_user_id,
+						'count'   => true,
+					)
+				);
+				$link               = add_query_arg( 'user_id', $current_user_id, $link );
 			} else {
 				$link = remove_query_arg( 'user_id', $link );
 			}
@@ -367,49 +370,50 @@ class WP_Comments_List_Table extends WP_List_Table {
 		if ( ! isset( $has_items ) ) {
 			$has_items = $this->has_items();
 		}
-?>
+		?>
 		<div class="alignleft actions">
-<?php
-if ( 'top' === $which ) {
-?>
+		<?php
+		if ( 'top' === $which ) {
+			?>
 	<label class="screen-reader-text" for="filter-by-comment-type"><?php _e( 'Filter by comment type' ); ?></label>
 	<select id="filter-by-comment-type" name="comment_type">
 		<option value=""><?php _e( 'All comment types' ); ?></option>
-<?php
-		/**
-		 * Filters the comment types dropdown menu.
-		 *
-		 * @since 2.7.0
-		 *
-		 * @param string[] $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
-		 */
-		$comment_types = apply_filters(
-			'admin_comment_types_dropdown', array(
-				'comment' => __( 'Comments' ),
-				'pings'   => __( 'Pings' ),
-			)
-		);
+			<?php
+				/**
+				 * Filters the comment types dropdown menu.
+				 *
+				 * @since 2.7.0
+				 *
+				 * @param string[] $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
+				 */
+				$comment_types = apply_filters(
+					'admin_comment_types_dropdown',
+					array(
+						'comment' => __( 'Comments' ),
+						'pings'   => __( 'Pings' ),
+					)
+				);
 
-foreach ( $comment_types as $type => $label ) {
-	echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
-}
-	?>
+			foreach ( $comment_types as $type => $label ) {
+				echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
+			}
+			?>
 	</select>
-<?php
-	/**
-	 * Fires just before the Filter submit button for comment types.
-	 *
-	 * @since 3.5.0
-	 */
-	do_action( 'restrict_manage_comments' );
-	submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
-}
+			<?php
+			/**
+			 * Fires just before the Filter submit button for comment types.
+			 *
+			 * @since 3.5.0
+			 */
+			do_action( 'restrict_manage_comments' );
+			submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+		}
 
-if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $has_items ) {
-	wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
-	$title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
-	submit_button( $title, 'apply', 'delete_all', false );
-}
+		if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $has_items ) {
+			wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
+			$title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
+			submit_button( $title, 'apply', 'delete_all', false );
+		}
 		/**
 		 * Fires after the Filter submit button for comment types.
 		 *
@@ -490,7 +494,7 @@ if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_us
 
 		$this->screen->render_screen_reader_content( 'heading_list' );
 
-?>
+		?>
 <table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
 	<thead>
 	<tr>
@@ -516,7 +520,7 @@ if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_us
 	</tfoot>
 
 </table>
-<?php
+		<?php
 
 		$this->display_tablenav( 'bottom' );
 	}
@@ -676,10 +680,10 @@ if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_us
 	 */
 	public function column_cb( $comment ) {
 		if ( $this->user_can ) {
-		?>
+			?>
 		<label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
 		<input id="cb-select-<?php echo $comment->comment_ID; ?>" type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" />
-		<?php
+			<?php
 		}
 	}
 
@@ -709,7 +713,7 @@ if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_us
 		if ( $this->user_can ) {
 			/** This filter is documented in wp-admin/includes/comment.php */
 			$comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
-		?>
+			?>
 		<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
 			<textarea class="comment" rows="1" cols="1"><?php echo esc_textarea( $comment_content ); ?></textarea>
 			<div class="author-email"><?php echo esc_attr( $comment->comment_author_email ); ?></div>
@@ -717,7 +721,7 @@ if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_us
 			<div class="author-url"><?php echo esc_attr( $comment->comment_author_url ); ?></div>
 			<div class="comment_status"><?php echo $comment->comment_approved; ?></div>
 		</div>
-		<?php
+			<?php
 		}
 	}
 
@@ -759,7 +763,8 @@ if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_us
 					array(
 						's'    => $author_ip,
 						'mode' => 'detail',
-					), admin_url( 'edit-comments.php' )
+					),
+					admin_url( 'edit-comments.php' )
 				);
 				if ( 'spam' === $comment_status ) {
 					$author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url );
diff --git a/wp-admin/includes/class-wp-internal-pointers.php b/wp-admin/includes/class-wp-internal-pointers.php
index a2194df686..18ea79b5a4 100644
--- a/wp-admin/includes/class-wp-internal-pointers.php
+++ b/wp-admin/includes/class-wp-internal-pointers.php
@@ -180,8 +180,8 @@ final class WP_Internal_Pointers {
 		}
 
 		$js_args = array(
-			'content'  => $content,
-			'position' => $position,
+			'content'      => $content,
+			'position'     => $position,
 			'pointerClass' => 'wp-pointer arrow-bottom',
 			'pointerWidth' => 420,
 		);
diff --git a/wp-admin/includes/class-wp-links-list-table.php b/wp-admin/includes/class-wp-links-list-table.php
index ae83ae2f5e..f3b519613a 100644
--- a/wp-admin/includes/class-wp-links-list-table.php
+++ b/wp-admin/includes/class-wp-links-list-table.php
@@ -100,9 +100,9 @@ class WP_Links_List_Table extends WP_List_Table {
 		if ( 'top' != $which ) {
 			return;
 		}
-?>
+		?>
 		<div class="alignleft actions">
-<?php
+		<?php
 			$dropdown_options = array(
 				'selected'        => $cat_id,
 				'name'            => 'cat_id',
@@ -117,9 +117,9 @@ class WP_Links_List_Table extends WP_List_Table {
 			echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
 			wp_dropdown_categories( $dropdown_options );
 			submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
-?>
+		?>
 		</div>
-<?php
+		<?php
 	}
 
 	/**
@@ -293,11 +293,11 @@ class WP_Links_List_Table extends WP_List_Table {
 			$link                = sanitize_bookmark( $link );
 			$link->link_name     = esc_attr( $link->link_name );
 			$link->link_category = wp_get_link_cats( $link->link_id );
-?>
+			?>
 		<tr id="link-<?php echo $link->link_id; ?>">
 			<?php $this->single_row_columns( $link ); ?>
 		</tr>
-<?php
+			<?php
 		}
 	}
 
diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php
index 90d254a777..f93e799c03 100644
--- a/wp-admin/includes/class-wp-list-table.php
+++ b/wp-admin/includes/class-wp-list-table.php
@@ -137,7 +137,8 @@ class WP_List_Table {
 	 */
 	public function __construct( $args = array() ) {
 		$args = wp_parse_args(
-			$args, array(
+			$args,
+			array(
 				'plural'   => '',
 				'singular' => '',
 				'ajax'     => false,
@@ -274,7 +275,8 @@ class WP_List_Table {
 	 */
 	protected function set_pagination_args( $args ) {
 		$args = wp_parse_args(
-			$args, array(
+			$args,
+			array(
 				'total_items' => 0,
 				'total_pages' => 0,
 				'per_page'    => 0,
@@ -360,13 +362,13 @@ class WP_List_Table {
 		if ( ! empty( $_REQUEST['detached'] ) ) {
 			echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
 		}
-?>
+		?>
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo esc_attr( $input_id ); ?>" name="s" value="<?php _admin_search_query(); ?>" />
-	<?php submit_button( $text, '', '', false, array( 'id' => 'search-submit' ) ); ?>
+		<?php submit_button( $text, '', '', false, array( 'id' => 'search-submit' ) ); ?>
 </p>
-<?php
+		<?php
 	}
 
 	/**
@@ -568,7 +570,8 @@ class WP_List_Table {
 			WHERE post_type = %s
 			$extra_checks
 			ORDER BY post_date DESC
-		", $post_type
+		",
+				$post_type
 			)
 		);
 
@@ -589,30 +592,30 @@ class WP_List_Table {
 		}
 
 		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
-?>
+		?>
 		<label for="filter-by-date" class="screen-reader-text"><?php _e( 'Filter by date' ); ?></label>
 		<select name="m" id="filter-by-date">
 			<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
-<?php
-foreach ( $months as $arc_row ) {
-	if ( 0 == $arc_row->year ) {
-		continue;
-	}
+		<?php
+		foreach ( $months as $arc_row ) {
+			if ( 0 == $arc_row->year ) {
+				continue;
+			}
 
-	$month = zeroise( $arc_row->month, 2 );
-	$year  = $arc_row->year;
+			$month = zeroise( $arc_row->month, 2 );
+			$year  = $arc_row->year;
 
-	printf(
-		"<option %s value='%s'>%s</option>\n",
-		selected( $m, $year . $month, false ),
-		esc_attr( $arc_row->year . $month ),
-		/* translators: 1: month name, 2: 4-digit year */
-		sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month ), $year )
-	);
-}
-?>
+			printf(
+				"<option %s value='%s'>%s</option>\n",
+				selected( $m, $year . $month, false ),
+				esc_attr( $arc_row->year . $month ),
+				/* translators: 1: month name, 2: 4-digit year */
+				sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month ), $year )
+			);
+		}
+		?>
 		</select>
-<?php
+		<?php
 	}
 
 	/**
@@ -623,25 +626,25 @@ foreach ( $months as $arc_row ) {
 	 * @param string $current_mode
 	 */
 	protected function view_switcher( $current_mode ) {
-?>
+		?>
 		<input type="hidden" name="mode" value="<?php echo esc_attr( $current_mode ); ?>" />
 		<div class="view-switch">
-<?php
-foreach ( $this->modes as $mode => $title ) {
-	$classes = array( 'view-' . $mode );
-	if ( $current_mode === $mode ) {
-		$classes[] = 'current';
-	}
-	printf(
-		"<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
-		esc_url( add_query_arg( 'mode', $mode ) ),
-		implode( ' ', $classes ),
-		$title
-	);
-}
+		<?php
+		foreach ( $this->modes as $mode => $title ) {
+			$classes = array( 'view-' . $mode );
+			if ( $current_mode === $mode ) {
+				$classes[] = 'current';
+			}
+			printf(
+				"<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
+				esc_url( add_query_arg( 'mode', $mode ) ),
+				implode( ' ', $classes ),
+				$title
+			);
+		}
 		?>
 		</div>
-<?php
+		<?php
 	}
 
 	/**
@@ -677,7 +680,8 @@ foreach ( $this->modes as $mode => $title ) {
 						array(
 							'p'              => $post_id,
 							'comment_status' => 'approved',
-						), admin_url( 'edit-comments.php' )
+						),
+						admin_url( 'edit-comments.php' )
 					)
 				),
 				$approved_comments_number,
@@ -699,7 +703,8 @@ foreach ( $this->modes as $mode => $title ) {
 						array(
 							'p'              => $post_id,
 							'comment_status' => 'moderated',
-						), admin_url( 'edit-comments.php' )
+						),
+						admin_url( 'edit-comments.php' )
 					)
 				),
 				$pending_comments_number,
@@ -1152,7 +1157,7 @@ foreach ( $this->modes as $mode => $title ) {
 		$this->display_tablenav( 'top' );
 
 		$this->screen->render_screen_reader_content( 'heading_list' );
-?>
+		?>
 <table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
 	<thead>
 	<tr>
@@ -1161,10 +1166,10 @@ foreach ( $this->modes as $mode => $title ) {
 	</thead>
 
 	<tbody id="the-list"
-	<?php
-	if ( $singular ) {
-		echo " data-wp-lists='list:$singular'";
-	}
+		<?php
+		if ( $singular ) {
+			echo " data-wp-lists='list:$singular'";
+		}
 		?>
 		>
 		<?php $this->display_rows_or_placeholder(); ?>
@@ -1177,7 +1182,7 @@ foreach ( $this->modes as $mode => $title ) {
 	</tfoot>
 
 </table>
-<?php
+		<?php
 		$this->display_tablenav( 'bottom' );
 	}
 
@@ -1209,7 +1214,7 @@ foreach ( $this->modes as $mode => $title ) {
 		<div class="alignleft actions bulkactions">
 			<?php $this->bulk_actions( $which ); ?>
 		</div>
-		<?php
+			<?php
 		endif;
 		$this->extra_tablenav( $which );
 		$this->pagination( $which );
@@ -1217,7 +1222,7 @@ foreach ( $this->modes as $mode => $title ) {
 
 		<br class="clear" />
 	</div>
-<?php
+		<?php
 	}
 
 	/**
diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php
index 0e75f59f55..4be710f52e 100644
--- a/wp-admin/includes/class-wp-media-list-table.php
+++ b/wp-admin/includes/class-wp-media-list-table.php
@@ -171,26 +171,26 @@ class WP_Media_List_Table extends WP_List_Table {
 		if ( 'bar' !== $which ) {
 			return;
 		}
-?>
+		?>
 		<div class="actions">
-<?php
-if ( ! is_singular() ) {
-	if ( ! $this->is_trash ) {
-		$this->months_dropdown( 'attachment' );
-	}
+		<?php
+		if ( ! is_singular() ) {
+			if ( ! $this->is_trash ) {
+				$this->months_dropdown( 'attachment' );
+			}
 
-	/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-	do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
+			do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
 
-	submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
-}
+			submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+		}
 
-if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
-	submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
-}
+		if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
+			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+		}
 		?>
 		</div>
-<?php
+		<?php
 	}
 
 	/**
@@ -236,7 +236,7 @@ if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_it
 		$views = $this->get_views();
 
 		$this->screen->render_screen_reader_content( 'heading_views' );
-?>
+		?>
 <div class="wp-filter">
 	<div class="filter-items">
 		<?php $this->view_switcher( $mode ); ?>
@@ -252,28 +252,28 @@ if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_it
 			?>
 		</select>
 
-<?php
+		<?php
 		$this->extra_tablenav( 'bar' );
 
 		/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
 		$views = apply_filters( "views_{$this->screen->id}", array() );
 
 		// Back compat for pre-4.0 view links.
-if ( ! empty( $views ) ) {
-	echo '<ul class="filter-links">';
-	foreach ( $views as $class => $view ) {
-		echo "<li class='$class'>$view</li>";
-	}
-	echo '</ul>';
-}
-?>
+		if ( ! empty( $views ) ) {
+			echo '<ul class="filter-links">';
+			foreach ( $views as $class => $view ) {
+				echo "<li class='$class'>$view</li>";
+			}
+			echo '</ul>';
+		}
+		?>
 	</div>
 
 	<div class="search-form">
 		<label for="media-search-input" class="screen-reader-text"><?php esc_html_e( 'Search Media' ); ?></label>
 		<input type="search" placeholder="<?php esc_attr_e( 'Search media items...' ); ?>" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></div>
 	</div>
-	<?php
+		<?php
 	}
 
 	/**
@@ -354,14 +354,14 @@ if ( ! empty( $views ) ) {
 	 */
 	public function column_cb( $post ) {
 		if ( current_user_can( 'edit_post', $post->ID ) ) {
-		?>
+			?>
 			<label class="screen-reader-text" for="cb-select-<?php echo $post->ID; ?>">
 																		<?php
 																		echo sprintf( __( 'Select %s' ), _draft_or_post_title() );
-			?>
+																		?>
 			</label>
 			<input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->ID; ?>" />
-		<?php
+			<?php
 		}
 	}
 
@@ -395,9 +395,9 @@ if ( ! empty( $views ) ) {
 			<?php
 			echo $link_start;
 			if ( $thumb ) :
-			?>
+				?>
 				<span class="media-icon <?php echo sanitize_html_class( $mime . '-icon' ); ?>"><?php echo $thumb; ?></span>
-			<?php
+				<?php
 			endif;
 			echo $title . $link_end;
 			_media_states( $post );
@@ -487,12 +487,12 @@ if ( ! empty( $views ) ) {
 			$parent_type = get_post_type_object( $parent->post_type );
 
 			if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) {
-?>
+				?>
 				<strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
 					<?php echo $title; ?></a></strong>
 								<?php
 			} elseif ( $parent_type && current_user_can( 'read_post', $post->post_parent ) ) {
-?>
+				?>
 				<strong><?php echo $title; ?></strong>
 									<?php
 			} else {
@@ -505,7 +505,8 @@ if ( ! empty( $views ) ) {
 						'parent_post_id' => $post->post_parent,
 						'media[]'        => $post->ID,
 						'_wpnonce'       => wp_create_nonce( 'bulk-' . $this->_args['plural'] ),
-					), 'upload.php'
+					),
+					'upload.php'
 				);
 				printf(
 					'<br /><a href="%s" class="hide-if-no-js detach-from-parent" aria-label="%s">%s</a>',
@@ -631,11 +632,11 @@ if ( ! empty( $views ) ) {
 				continue;
 			}
 			$post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
-		?>
+			?>
 			<tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim( ' author-' . $post_owner . ' status-' . $post->post_status ); ?>">
 				<?php $this->single_row_columns( $post ); ?>
 			</tr>
-		<?php
+			<?php
 		endwhile;
 	}
 
diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php
index 0cfef5b27c..c9399b220b 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -176,7 +176,8 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 
 		$total_sites = get_sites(
 			array_merge(
-				$args, array(
+				$args,
+				array(
 					'count'  => true,
 					'offset' => 0,
 					'number' => 0,
@@ -275,14 +276,14 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 	public function column_cb( $blog ) {
 		if ( ! is_main_site( $blog['blog_id'] ) ) :
 			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
-		?>
+			?>
 			<label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>">
 																	<?php
 																	printf( __( 'Select %s' ), $blogname );
-			?>
+																	?>
 			</label>
 			<input type="checkbox" id="blog_<?php echo $blog['blog_id']; ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ); ?>" />
-		<?php
+			<?php
 		endif;
 	}
 
@@ -406,12 +407,14 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 	public function column_users( $blog ) {
 		$user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
 		if ( ! $user_count ) {
-			$blog_users = new WP_User_Query( array(
-				'blog_id'     => $blog['blog_id'],
-				'fields'      => 'ID',
-				'number'      => 1,
-				'count_total' => true,
-			) );
+			$blog_users = new WP_User_Query(
+				array(
+					'blog_id'     => $blog['blog_id'],
+					'fields'      => 'ID',
+					'number'      => 1,
+					'count_total' => true,
+				)
+			);
 			$user_count = $blog_users->get_total();
 			wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
 		}
diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php
index 36a0743bd3..294f2c82f8 100644
--- a/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -153,7 +153,9 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		$total_this_page = $totals[ $status ];
 
 		wp_localize_script(
-			'updates', '_wpUpdatesItemCounts', array(
+			'updates',
+			'_wpUpdatesItemCounts',
+			array(
 				'themes' => $totals,
 				'totals' => wp_get_update_data(),
 			)
@@ -423,7 +425,8 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 						'theme'  => $theme_key,
 						'paged'  => $page,
 						's'      => $s,
-					), $url
+					),
+					$url
 				);
 
 				if ( $this->is_site_themes ) {
@@ -448,7 +451,8 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 					'theme'  => $theme_key,
 					'paged'  => $page,
 					's'      => $s,
-				), $url
+				),
+				$url
 			);
 
 			if ( $this->is_site_themes ) {
@@ -475,7 +479,8 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 					'theme_status' => $context,
 					'paged'        => $page,
 					's'            => $s,
-				), 'themes.php'
+				),
+				'themes.php'
 			);
 
 			/* translators: %s: theme name */
diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php
index 3482c3cf7a..ad4f2b1062 100644
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -143,10 +143,10 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		$installed_plugins = $this->get_installed_plugins();
 
 		$args = array(
-			'page'              => $paged,
-			'per_page'          => $per_page,
+			'page'     => $paged,
+			'per_page' => $per_page,
 			// Send the locale to the API so it can provide context-sensitive results.
-			'locale'            => get_user_locale(),
+			'locale'   => get_user_locale(),
 		);
 
 		switch ( $tab ) {
@@ -256,7 +256,9 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 			}
 
 			wp_localize_script(
-				'updates', '_wpUpdatesItemCounts', array(
+				'updates',
+				'_wpUpdatesItemCounts',
+				array(
 					'plugins' => $js_plugins,
 					'totals'  => wp_get_update_data(),
 				)
@@ -273,7 +275,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 			</div>
 		<?php } else { ?>
 			<div class="no-plugin-results"><?php _e( 'No plugins found. Try a different search.' ); ?></div>
-		<?php
+			<?php
 }
 	}
 
@@ -308,7 +310,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		$views = apply_filters( "views_{$this->screen->id}", $views );
 
 		$this->screen->render_screen_reader_content( 'heading_views' );
-?>
+		?>
 <div class="wp-filter">
 	<ul class="filter-links">
 		<?php
@@ -321,9 +323,9 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		?>
 	</ul>
 
-	<?php install_search_form(); ?>
+		<?php install_search_form(); ?>
 </div>
-<?php
+		<?php
 	}
 
 	/**
@@ -340,16 +342,16 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 		$this->display_tablenav( 'top' );
 
-?>
+		?>
 <div class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
-<?php
-	$this->screen->render_screen_reader_content( 'heading_list' );
-?>
+		<?php
+		$this->screen->render_screen_reader_content( 'heading_list' );
+		?>
 	<div id="the-list"<?php echo $data_attr; ?>>
 		<?php $this->display_rows_or_placeholder(); ?>
 	</div>
 </div>
-<?php
+		<?php
 		$this->display_tablenav( 'bottom' );
 	}
 
@@ -365,7 +367,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 		if ( 'top' === $which ) {
 			wp_referer_field();
-		?>
+			?>
 			<div class="tablenav top">
 				<div class="alignleft actions">
 					<?php
@@ -385,7 +387,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 				<?php $this->pagination( $which ); ?>
 				<br class="clear" />
 			</div>
-		<?php
+			<?php
 }
 	}
 
@@ -560,7 +562,8 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 									'_wpnonce' => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
 									'action'   => 'activate',
 									'plugin'   => $status['file'],
-								), network_admin_url( 'plugins.php' )
+								),
+								network_admin_url( 'plugins.php' )
 							);
 
 							if ( is_network_admin() ) {
@@ -621,7 +624,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 			$action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
 
 			$last_updated_timestamp = strtotime( $plugin['last_updated'] );
-		?>
+			?>
 		<div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
 			<?php
 			if ( ! $compatible_php || ! $compatible_wp ) {
@@ -651,7 +654,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 							self_admin_url( 'update-core.php' )
 						);
 					}
-				} elseif ( ! $compatible_php  ) {
+				} elseif ( ! $compatible_php ) {
 					_e( 'This plugin doesn&#8217;t work with your version of PHP. ' );
 					printf(
 						/* translators: %s: "Updating PHP" page URL */
@@ -703,7 +706,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 					<?php
 					if ( $plugin['active_installs'] >= 1000000 ) {
 						$active_installs_millions = floor( $plugin['active_installs'] / 1000000 );
-						$active_installs_text = sprintf(
+						$active_installs_text     = sprintf(
 							_nx( '%s+ Million', '%s+ Million', $active_installs_millions, 'Active plugin installations' ),
 							number_format_i18n( $active_installs_millions )
 						);
@@ -728,7 +731,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 				</div>
 			</div>
 		</div>
-		<?php
+			<?php
 		}
 
 		// Close off the group divs of the last one
diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php
index 6e130f94b4..1f540c9ed2 100644
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -256,7 +256,9 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		}
 
 		wp_localize_script(
-			'updates', '_wpUpdatesItemCounts', array(
+			'updates',
+			'_wpUpdatesItemCounts',
+			array(
 				'plugins' => $js_plugins,
 				'totals'  => wp_get_update_data(),
 			)
diff --git a/wp-admin/includes/class-wp-post-comments-list-table.php b/wp-admin/includes/class-wp-post-comments-list-table.php
index f49d039778..29dc286310 100644
--- a/wp-admin/includes/class-wp-post-comments-list-table.php
+++ b/wp-admin/includes/class-wp-post-comments-list-table.php
@@ -49,13 +49,13 @@ class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
 		$singular = $this->_args['singular'];
 
 		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
-?>
+		?>
 <table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" style="display:none;">
 	<tbody id="the-comment-list"
-	<?php
-	if ( $singular ) {
-		echo " data-wp-lists='list:$singular'";
-	}
+		<?php
+		if ( $singular ) {
+			echo " data-wp-lists='list:$singular'";
+		}
 		?>
 		>
 		<?php
@@ -65,7 +65,7 @@ class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
 		?>
 	</tbody>
 </table>
-<?php
+		<?php
 	}
 
 	/**
diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index 671b8f2917..ced70bad84 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -98,7 +98,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 			WHERE post_type = %s
 			AND post_status NOT IN ( '" . implode( "','", $exclude_states ) . "' )
 			AND post_author = %d
-		", $post_type, get_current_user_id()
+		",
+					$post_type,
+					get_current_user_id()
 				)
 			)
 		);
@@ -460,46 +462,46 @@ class WP_Posts_List_Table extends WP_List_Table {
 	 * @param string $which
 	 */
 	protected function extra_tablenav( $which ) {
-?>
+		?>
 		<div class="alignleft actions">
-<?php
-if ( 'top' === $which && ! is_singular() ) {
-	ob_start();
+		<?php
+		if ( 'top' === $which && ! is_singular() ) {
+			ob_start();
 
-	$this->months_dropdown( $this->screen->post_type );
-	$this->categories_dropdown( $this->screen->post_type );
+			$this->months_dropdown( $this->screen->post_type );
+			$this->categories_dropdown( $this->screen->post_type );
 
-	/**
-	 * Fires before the Filter button on the Posts and Pages list tables.
-	 *
-	 * The Filter button allows sorting by date and/or category on the
-	 * Posts list table, and sorting by date on the Pages list table.
-	 *
-	 * @since 2.1.0
-	 * @since 4.4.0 The `$post_type` parameter was added.
-	 * @since 4.6.0 The `$which` parameter was added.
-	 *
-	 * @param string $post_type The post type slug.
-	 * @param string $which     The location of the extra table nav markup:
-	 *                          'top' or 'bottom' for WP_Posts_List_Table,
-	 *                          'bar' for WP_Media_List_Table.
-	 */
-	do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+			/**
+			 * Fires before the Filter button on the Posts and Pages list tables.
+			 *
+			 * The Filter button allows sorting by date and/or category on the
+			 * Posts list table, and sorting by date on the Pages list table.
+			 *
+			 * @since 2.1.0
+			 * @since 4.4.0 The `$post_type` parameter was added.
+			 * @since 4.6.0 The `$which` parameter was added.
+			 *
+			 * @param string $post_type The post type slug.
+			 * @param string $which     The location of the extra table nav markup:
+			 *                          'top' or 'bottom' for WP_Posts_List_Table,
+			 *                          'bar' for WP_Media_List_Table.
+			 */
+			do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
 
-	$output = ob_get_clean();
+			$output = ob_get_clean();
 
-	if ( ! empty( $output ) ) {
-		echo $output;
-		submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
-	}
-}
+			if ( ! empty( $output ) ) {
+				echo $output;
+				submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			}
+		}
 
-if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) && $this->has_items() ) {
-	submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
-}
-?>
+		if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) && $this->has_items() ) {
+			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+		}
+		?>
 		</div>
-<?php
+		<?php
 		/**
 		 * Fires immediately following the closing "actions" div in the tablenav for the posts
 		 * list table.
@@ -850,11 +852,11 @@ if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->p
 	 */
 	public function column_cb( $post ) {
 		if ( current_user_can( 'edit_post', $post->ID ) ) :
-		?>
+			?>
 			<label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>">
 																				<?php
 																				printf( __( 'Select %s' ), _draft_or_post_title() );
-			?>
+																				?>
 			</label>
 			<input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
 			<div class="locked-indicator">
@@ -869,7 +871,7 @@ if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->p
 				?>
 				</span>
 			</div>
-		<?php
+			<?php
 		endif;
 	}
 
@@ -1219,11 +1221,11 @@ if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->p
 		} else {
 			$classes .= ' level-0';
 		}
-	?>
+		?>
 		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
 			<?php $this->single_row_columns( $post ); ?>
 		</tr>
-	<?php
+		<?php
 		$GLOBALS['post'] = $global_post;
 	}
 
@@ -1417,7 +1419,7 @@ if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->p
 			'author'     => true,
 		);
 
-	?>
+		?>
 
 	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<?php
@@ -1428,28 +1430,28 @@ if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->p
 
 		$bulk = 0;
 		while ( $bulk < 2 ) {
-		?>
+			?>
 
 		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="
 							<?php
 							echo $inline_edit_classes . ' ';
 							echo $bulk ? $bulk_edit_classes : $quick_edit_classes;
-		?>
+							?>
 		" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
 		<fieldset class="inline-edit-col-left">
 			<legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>
 			<div class="inline-edit-col">
-	<?php
+			<?php
 
-	if ( post_type_supports( $screen->post_type, 'title' ) ) :
-		if ( $bulk ) :
-		?>
+			if ( post_type_supports( $screen->post_type, 'title' ) ) :
+				if ( $bulk ) :
+					?>
 			<div id="bulk-title-div">
 				<div id="bulk-titles"></div>
 			</div>
 
-	<?php else : // $bulk ?>
+			<?php else : // $bulk ?>
 
 			<label>
 				<span class="title"><?php _e( 'Title' ); ?></span>
@@ -1464,15 +1466,15 @@ if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->p
 	<?php
 	endif; // $bulk
 	endif; // post_type_supports title
-	?>
+			?>
 
-	<?php if ( ! $bulk ) : ?>
+			<?php if ( ! $bulk ) : ?>
 			<fieldset class="inline-edit-date">
 			<legend><span class="title"><?php _e( 'Date' ); ?></span></legend>
 				<?php touch_time( 1, 1, 0, 1 ); ?>
 			</fieldset>
 			<br class="clear" />
-	<?php
+				<?php
 	endif; // $bulk
 
 if ( post_type_supports( $screen->post_type, 'author' ) ) :
@@ -1531,16 +1533,16 @@ if ( ! $bulk && $can_publish ) :
 
 		</div></fieldset>
 
-	<?php if ( count( $hierarchical_taxonomies ) && ! $bulk ) : ?>
+			<?php if ( count( $hierarchical_taxonomies ) && ! $bulk ) : ?>
 
 		<fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
 
-	<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
+				<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
 
 			<span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ); ?></span>
 			<input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
 			<ul class="cat-checklist <?php echo esc_attr( $taxonomy->name ); ?>-checklist">
-				<?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ); ?>
+					<?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ); ?>
 			</ul>
 
 	<?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>
@@ -1551,69 +1553,69 @@ if ( ! $bulk && $can_publish ) :
 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
-	<?php
-	if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {
-		echo $authors_dropdown;
-	}
+			<?php
+			if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {
+				echo $authors_dropdown;
+			}
 
-	if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
+			if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
 
-		if ( $post_type_object->hierarchical ) :
-		?>
+				if ( $post_type_object->hierarchical ) :
+					?>
 		<label>
 			<span class="title"><?php _e( 'Parent' ); ?></span>
-	<?php
-	$dropdown_args = array(
-		'post_type'         => $post_type_object->name,
-		'selected'          => $post->post_parent,
-		'name'              => 'post_parent',
-		'show_option_none'  => __( 'Main Page (no parent)' ),
-		'option_none_value' => 0,
-		'sort_column'       => 'menu_order, post_title',
-	);
+					<?php
+					$dropdown_args = array(
+						'post_type'         => $post_type_object->name,
+						'selected'          => $post->post_parent,
+						'name'              => 'post_parent',
+						'show_option_none'  => __( 'Main Page (no parent)' ),
+						'option_none_value' => 0,
+						'sort_column'       => 'menu_order, post_title',
+					);
 
-	if ( $bulk ) {
-		$dropdown_args['show_option_no_change'] = __( '&mdash; No Change &mdash;' );
-	}
+					if ( $bulk ) {
+						$dropdown_args['show_option_no_change'] = __( '&mdash; No Change &mdash;' );
+					}
 
-	/**
-	 * Filters the arguments used to generate the Quick Edit page-parent drop-down.
-	 *
-	 * @since 2.7.0
-	 *
-	 * @see wp_dropdown_pages()
-	 *
-	 * @param array $dropdown_args An array of arguments.
-	 */
-	$dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );
+					/**
+					 * Filters the arguments used to generate the Quick Edit page-parent drop-down.
+					 *
+					 * @since 2.7.0
+					 *
+					 * @see wp_dropdown_pages()
+					 *
+					 * @param array $dropdown_args An array of arguments.
+					 */
+					$dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );
 
-	wp_dropdown_pages( $dropdown_args );
-?>
+					wp_dropdown_pages( $dropdown_args );
+					?>
 		</label>
 
-<?php
-		endif; // hierarchical
+					<?php
+				endif; // hierarchical
 
-		if ( ! $bulk ) :
-			?>
+				if ( ! $bulk ) :
+					?>
 
 			<label>
 				<span class="title"><?php _e( 'Order' ); ?></span>
 				<span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order; ?>" /></span>
 			</label>
 
-	<?php
-		endif; // !$bulk
+					<?php
+				endif; // !$bulk
 		endif; // page-attributes
-	?>
+			?>
 
-	<?php if ( 0 < count( get_page_templates( null, $screen->post_type ) ) ) : ?>
+			<?php if ( 0 < count( get_page_templates( null, $screen->post_type ) ) ) : ?>
 		<label>
 			<span class="title"><?php _e( 'Template' ); ?></span>
 			<select name="page_template">
-<?php	if ( $bulk ) : ?>
+				<?php	if ( $bulk ) : ?>
 				<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-<?php	endif; // $bulk ?>
+				<?php	endif; // $bulk ?>
 				<?php
 				/** This filter is documented in wp-admin/includes/meta-boxes.php */
 				$default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'quick-edit' );
@@ -1624,31 +1626,31 @@ if ( ! $bulk && $can_publish ) :
 		</label>
 	<?php endif; ?>
 
-	<?php if ( count( $flat_taxonomies ) && ! $bulk ) : ?>
+			<?php if ( count( $flat_taxonomies ) && ! $bulk ) : ?>
 
-	<?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
-		<?php
-		if ( current_user_can( $taxonomy->cap->assign_terms ) ) :
-			$taxonomy_name = esc_attr( $taxonomy->name );
+				<?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
+					<?php
+					if ( current_user_can( $taxonomy->cap->assign_terms ) ) :
+						$taxonomy_name = esc_attr( $taxonomy->name );
 
-			?>
+						?>
 			<label class="inline-edit-tags">
 				<span class="title"><?php echo esc_html( $taxonomy->labels->name ); ?></span>
 				<textarea data-wp-taxonomy="<?php echo $taxonomy_name; ?>" cols="22" rows="1" name="tax_input[<?php echo $taxonomy_name; ?>]" class="tax_input_<?php echo $taxonomy_name; ?>"></textarea>
 			</label>
-		<?php endif; ?>
+					<?php endif; ?>
 
 	<?php endforeach; //$flat_taxonomies as $taxonomy ?>
 
 	<?php endif; // count( $flat_taxonomies ) && !$bulk ?>
 
-	<?php
-	if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
-		if ( $bulk ) :
-		?>
+			<?php
+			if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
+				if ( $bulk ) :
+					?>
 
 			<div class="inline-edit-group wp-clearfix">
-		<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+					<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 			<label class="alignleft">
 				<span class="title"><?php _e( 'Comments' ); ?></span>
 				<select name="comment_status">
@@ -1669,7 +1671,7 @@ if ( ! $bulk && $can_publish ) :
 		<?php endif; ?>
 			</div>
 
-	<?php else : // $bulk ?>
+			<?php else : // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
 			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
@@ -1688,19 +1690,19 @@ if ( ! $bulk && $can_publish ) :
 	<?php
 	endif; // $bulk
 	endif; // post_type_supports comments or pings
-	?>
+			?>
 
 			<div class="inline-edit-group wp-clearfix">
 				<label class="inline-edit-status alignleft">
 					<span class="title"><?php _e( 'Status' ); ?></span>
 					<select name="_status">
-	<?php if ( $bulk ) : ?>
+			<?php if ( $bulk ) : ?>
 						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
 	<?php endif; // $bulk ?>
 					<?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
 						<option value="publish"><?php _e( 'Published' ); ?></option>
 						<option value="future"><?php _e( 'Scheduled' ); ?></option>
-	<?php if ( $bulk ) : ?>
+						<?php if ( $bulk ) : ?>
 						<option value="private"><?php _e( 'Private' ); ?></option>
 	<?php endif; // $bulk ?>
 					<?php endif; ?>
@@ -1709,9 +1711,9 @@ if ( ! $bulk && $can_publish ) :
 					</select>
 				</label>
 
-	<?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
+			<?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
 
-	<?php	if ( $bulk ) : ?>
+				<?php	if ( $bulk ) : ?>
 
 				<label class="alignright">
 					<span class="title"><?php _e( 'Sticky' ); ?></span>
@@ -1735,69 +1737,69 @@ if ( ! $bulk && $can_publish ) :
 
 			</div>
 
-	<?php
+			<?php
 
-	if ( $bulk && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) ) {
-		$post_formats = get_theme_support( 'post-formats' );
+			if ( $bulk && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) ) {
+				$post_formats = get_theme_support( 'post-formats' );
 
-		?>
+				?>
 		<label class="alignleft">
 		<span class="title"><?php _ex( 'Format', 'post format' ); ?></span>
 		<select name="post_format">
 			<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
 			<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
-			<?php
-			if ( is_array( $post_formats[0] ) ) {
-				foreach ( $post_formats[0] as $format ) {
-					?>
+				<?php
+				if ( is_array( $post_formats[0] ) ) {
+					foreach ( $post_formats[0] as $format ) {
+						?>
 					<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
-					<?php
+						<?php
+					}
 				}
-			}
-			?>
+				?>
 		</select></label>
-	<?php
+				<?php
 
-	}
+			}
 
-	?>
+			?>
 
 		</div></fieldset>
 
-	<?php
-		list( $columns ) = $this->get_column_info();
+			<?php
+			list( $columns ) = $this->get_column_info();
 
-	foreach ( $columns as $column_name => $column_display_name ) {
-		if ( isset( $core_columns[ $column_name ] ) ) {
-			continue;
-		}
+			foreach ( $columns as $column_name => $column_display_name ) {
+				if ( isset( $core_columns[ $column_name ] ) ) {
+					continue;
+				}
 
-		if ( $bulk ) {
+				if ( $bulk ) {
 
-			/**
-			 * Fires once for each column in Bulk Edit mode.
-			 *
-			 * @since 2.7.0
-			 *
-			 * @param string  $column_name Name of the column to edit.
-			 * @param WP_Post $post_type   The post type slug.
-			 */
-			do_action( 'bulk_edit_custom_box', $column_name, $screen->post_type );
-		} else {
+					/**
+					 * Fires once for each column in Bulk Edit mode.
+					 *
+					 * @since 2.7.0
+					 *
+					 * @param string  $column_name Name of the column to edit.
+					 * @param WP_Post $post_type   The post type slug.
+					 */
+					do_action( 'bulk_edit_custom_box', $column_name, $screen->post_type );
+				} else {
 
-			/**
-			 * Fires once for each column in Quick Edit mode.
-			 *
-			 * @since 2.7.0
-			 *
-			 * @param string $column_name Name of the column to edit.
-			 * @param string $post_type   The post type slug, or current screen name if this is a taxonomy list table.
-			 * @param string taxonomy     The taxonomy name, if any.
-			 */
-			do_action( 'quick_edit_custom_box', $column_name, $screen->post_type, '' );
-		}
-	}
-	?>
+					/**
+					 * Fires once for each column in Quick Edit mode.
+					 *
+					 * @since 2.7.0
+					 *
+					 * @param string $column_name Name of the column to edit.
+					 * @param string $post_type   The post type slug, or current screen name if this is a taxonomy list table.
+					 * @param string taxonomy     The taxonomy name, if any.
+					 */
+					do_action( 'quick_edit_custom_box', $column_name, $screen->post_type, '' );
+				}
+			}
+			?>
 		<div class="submit inline-edit-save">
 			<button type="button" class="button cancel alignleft"><?php _e( 'Cancel' ); ?></button>
 			<?php
@@ -1806,7 +1808,7 @@ if ( ! $bulk && $can_publish ) :
 				?>
 				<button type="button" class="button button-primary save alignright"><?php _e( 'Update' ); ?></button>
 				<span class="spinner"></span>
-			<?php
+				<?php
 			} else {
 				submit_button( __( 'Update' ), 'primary alignright', 'bulk_edit', false );
 			}
@@ -1822,11 +1824,11 @@ if ( ! $bulk && $can_publish ) :
 			</div>
 		</div>
 		</td></tr>
-	<?php
-		$bulk++;
+			<?php
+			$bulk++;
 		}
-?>
+		?>
 		</tbody></table></form>
-<?php
+		<?php
 	}
 }
diff --git a/wp-admin/includes/class-wp-screen.php b/wp-admin/includes/class-wp-screen.php
index 8e8499026a..3f63539f63 100644
--- a/wp-admin/includes/class-wp-screen.php
+++ b/wp-admin/includes/class-wp-screen.php
@@ -806,7 +806,7 @@ final class WP_Screen {
 									<?php echo esc_html( $tab['title'] ); ?>
 								</a>
 							</li>
-						<?php
+							<?php
 							$class = '';
 						endforeach;
 						?>
@@ -837,7 +837,7 @@ final class WP_Screen {
 								}
 								?>
 							</div>
-						<?php
+							<?php
 							$classes = 'help-tab-content';
 						endforeach;
 						?>
@@ -890,10 +890,10 @@ final class WP_Screen {
 			<div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
 			<button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button>
 			</div>
-		<?php
+			<?php
 		endif;
 if ( $this->show_screen_options() ) :
-		?>
+	?>
 			<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
 			<button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
 			</div>
@@ -968,7 +968,8 @@ if ( $this->show_screen_options() ) :
 	 */
 	public function render_screen_options( $options = array() ) {
 		$options = wp_parse_args(
-			$options, array(
+			$options,
+			array(
 				'wrap' => true,
 			)
 		);
@@ -1121,12 +1122,12 @@ if ( $this->show_screen_options() ) :
 													?>
 													<label class="columns-prefs-<?php echo $i; ?>">
 				<input type='radio' name='screen_columns' value='<?php echo esc_attr( $i ); ?>'
-					<?php checked( $screen_layout_columns, $i ); ?> />
-				<?php printf( _n( '%s column', '%s columns', $i ), number_format_i18n( $i ) ); ?>
+													<?php checked( $screen_layout_columns, $i ); ?> />
+													<?php printf( _n( '%s column', '%s columns', $i ), number_format_i18n( $i ) ); ?>
 				</label>
-				<?php
+													<?php
 			endfor;
-			?>
+												?>
 		</fieldset>
 		<?php
 	}
@@ -1235,7 +1236,7 @@ if ( $this->show_screen_options() ) :
 
 		// This needs a submit button
 		add_filter( 'screen_options_show_submit', '__return_true' );
-?>
+		?>
 		<fieldset class="metabox-prefs view-mode">
 		<legend><?php _e( 'View Mode' ); ?></legend>
 				<label for="list-view-mode">
@@ -1247,7 +1248,7 @@ if ( $this->show_screen_options() ) :
 					<?php _e( 'Excerpt View' ); ?>
 				</label>
 		</fieldset>
-<?php
+		<?php
 	}
 
 	/**
diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php
index 0afe832607..94e419c189 100644
--- a/wp-admin/includes/class-wp-terms-list-table.php
+++ b/wp-admin/includes/class-wp-terms-list-table.php
@@ -212,7 +212,8 @@ class WP_Terms_List_Table extends WP_List_Table {
 		$taxonomy = $this->screen->taxonomy;
 
 		$args = wp_parse_args(
-			$this->callback_args, array(
+			$this->callback_args,
+			array(
 				'page'       => 1,
 				'number'     => 20,
 				'search'     => '',
@@ -385,7 +386,7 @@ class WP_Terms_List_Table extends WP_List_Table {
 				urlencode( wp_unslash( $uri ) ),
 				$edit_link
 			);
-			$name = sprintf(
+			$name      = sprintf(
 				'<a class="row-title" href="%s" aria-label="%s">%s</a>',
 				esc_url( $edit_link ),
 				/* translators: %s: taxonomy term name */
@@ -607,7 +608,7 @@ class WP_Terms_List_Table extends WP_List_Table {
 		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
 			return;
 		}
-?>
+		?>
 
 	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
@@ -619,14 +620,14 @@ class WP_Terms_List_Table extends WP_List_Table {
 					<span class="title"><?php _ex( 'Name', 'term name' ); ?></span>
 					<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
 				</label>
-	<?php if ( ! global_terms_enabled() ) { ?>
+		<?php if ( ! global_terms_enabled() ) { ?>
 				<label>
 					<span class="title"><?php _e( 'Slug' ); ?></span>
 					<span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
 				</label>
 	<?php } ?>
 			</div></fieldset>
-	<?php
+		<?php
 
 		$core_columns = array(
 			'cb'          => true,
@@ -638,16 +639,16 @@ class WP_Terms_List_Table extends WP_List_Table {
 
 		list( $columns ) = $this->get_column_info();
 
-	foreach ( $columns as $column_name => $column_display_name ) {
-		if ( isset( $core_columns[ $column_name ] ) ) {
-			continue;
+		foreach ( $columns as $column_name => $column_display_name ) {
+			if ( isset( $core_columns[ $column_name ] ) ) {
+				continue;
+			}
+
+			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
+			do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );
 		}
 
-		/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-		do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );
-	}
-
-	?>
+		?>
 
 		<div class="inline-edit-save submit">
 			<button type="button" class="cancel button alignleft"><?php _e( 'Cancel' ); ?></button>
@@ -663,6 +664,6 @@ class WP_Terms_List_Table extends WP_List_Table {
 		</div>
 		</td></tr>
 		</tbody></table></form>
-	<?php
+		<?php
 	}
 }
diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php
index 938dab4cf3..492e24ba13 100644
--- a/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -190,7 +190,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	 */
 	public function display() {
 		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
-?>
+		?>
 		<div class="tablenav top themes">
 			<div class="alignleft actions">
 				<?php
@@ -219,13 +219,13 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	public function display_rows() {
 		$themes = $this->items;
 		foreach ( $themes as $theme ) {
-				?>
+			?>
 				<div class="available-theme installable-theme">
 				<?php
 					$this->single_row( $theme );
 				?>
 				</div>
-		<?php
+			<?php
 		} // end foreach $theme_names
 
 		$this->theme_installer();
@@ -270,7 +270,8 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 			array(
 				'tab'   => 'theme-information',
 				'theme' => $theme->slug,
-			), self_admin_url( 'theme-install.php' )
+			),
+			self_admin_url( 'theme-install.php' )
 		);
 
 		$actions = array();
@@ -279,14 +280,16 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 			array(
 				'action' => 'install-theme',
 				'theme'  => $theme->slug,
-			), self_admin_url( 'update.php' )
+			),
+			self_admin_url( 'update.php' )
 		);
 
 		$update_url = add_query_arg(
 			array(
 				'action' => 'upgrade-theme',
 				'theme'  => $theme->slug,
-			), self_admin_url( 'update.php' )
+			),
+			self_admin_url( 'update.php' )
 		);
 
 		$status = $this->_get_theme_status( $theme );
@@ -346,10 +349,12 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		</a>
 
 		<h3><?php echo $name; ?></h3>
-		<div class="theme-author"><?php
+		<div class="theme-author">
+		<?php
 			/* translators: %s: theme author */
 			printf( __( 'By %s' ), $author );
-		?></div>
+		?>
+		</div>
 
 		<div class="action-links">
 			<ul>
@@ -430,14 +435,16 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 			array(
 				'action' => 'install-theme',
 				'theme'  => $theme->slug,
-			), self_admin_url( 'update.php' )
+			),
+			self_admin_url( 'update.php' )
 		);
 
 		$update_url = add_query_arg(
 			array(
 				'action' => 'upgrade-theme',
 				'theme'  => $theme->slug,
-			), self_admin_url( 'update.php' )
+			),
+			self_admin_url( 'update.php' )
 		);
 
 		$status = $this->_get_theme_status( $theme );
@@ -472,12 +479,14 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 				);
 				break;
 		}
-			?>
+		?>
 			<h3 class="theme-name"><?php echo $name; ?></h3>
-			<span class="theme-by"><?php
+			<span class="theme-by">
+			<?php
 				/* translators: %s: theme author */
 				printf( __( 'By %s' ), $author );
-			?></span>
+			?>
+			</span>
 			<?php if ( isset( $theme->screenshot_url ) ) : ?>
 				<img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />
 			<?php endif; ?>
diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php
index c0f86135ae..290b7cbc59 100644
--- a/wp-admin/includes/class-wp-themes-list-table.php
+++ b/wp-admin/includes/class-wp-themes-list-table.php
@@ -137,7 +137,7 @@ class WP_Themes_List_Table extends WP_List_Table {
 	 */
 	public function display() {
 		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
-?>
+		?>
 		<?php $this->tablenav( 'top' ); ?>
 
 		<div id="availablethemes">
@@ -145,7 +145,7 @@ class WP_Themes_List_Table extends WP_List_Table {
 		</div>
 
 		<?php $this->tablenav( 'bottom' ); ?>
-<?php
+		<?php
 	}
 
 	/**
@@ -250,7 +250,7 @@ class WP_Themes_List_Table extends WP_List_Table {
 			</div>
 
 			</div>
-		<?php
+			<?php
 		endforeach;
 	}
 
diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index a8de2904be..5d7cfde73f 100644
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -264,7 +264,7 @@ class WP_Users_List_Table extends WP_List_Table {
 	protected function extra_tablenav( $which ) {
 		$id        = 'bottom' === $which ? 'new_role2' : 'new_role';
 		$button_id = 'bottom' === $which ? 'changeit2' : 'changeit';
-	?>
+		?>
 	<div class="alignleft actions">
 		<?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
 		<label class="screen-reader-text" for="<?php echo $id; ?>"><?php _e( 'Change role to&hellip;' ); ?></label>
@@ -272,7 +272,7 @@ class WP_Users_List_Table extends WP_List_Table {
 			<option value=""><?php _e( 'Change role to&hellip;' ); ?></option>
 			<?php wp_dropdown_roles(); ?>
 		</select>
-	<?php
+			<?php
 			submit_button( __( 'Change' ), '', $button_id, false );
 		endif;
 
@@ -286,9 +286,9 @@ class WP_Users_List_Table extends WP_List_Table {
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
 		do_action( 'restrict_manage_users', $which );
-	?>
+?>
 		</div>
-	<?php
+		<?php
 		/**
 		 * Fires immediately following the closing "actions" div in the tablenav for the users
 		 * list table.
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 0c5bb5f5b1..5b13f686a1 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -226,7 +226,7 @@ function wp_dashboard() {
 		$columns_css = " columns-$columns";
 	}
 
-?>
+	?>
 <div id="dashboard-widgets" class="metabox-holder<?php echo $columns_css; ?>">
 	<div id="postbox-container-1" class="postbox-container">
 	<?php do_meta_boxes( $screen->id, 'normal', '' ); ?>
@@ -242,7 +242,7 @@ function wp_dashboard() {
 	</div>
 </div>
 
-<?php
+	<?php
 	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
 	wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
 
@@ -260,7 +260,7 @@ function wp_dashboard() {
  * @since 2.7.0
  */
 function wp_dashboard_right_now() {
-?>
+	?>
 	<div class="main">
 	<ul>
 	<?php
@@ -388,11 +388,11 @@ function wp_dashboard_right_now() {
 	$actions = ob_get_clean();
 
 	if ( ! empty( $actions ) ) :
-	?>
+		?>
 	<div class="sub">
 		<?php echo $actions; ?>
 	</div>
-	<?php
+		<?php
 	endif;
 }
 
@@ -427,7 +427,7 @@ function wp_network_dashboard_right_now() {
 		echo implode( " |</li>\n", $actions ) . "</li>\n";
 		echo '</ul>';
 	}
-?>
+	?>
 	<br class="clear" />
 
 	<p class="youhave"><?php echo $sentence; ?></p>
@@ -458,7 +458,7 @@ function wp_network_dashboard_right_now() {
 			<?php submit_button( __( 'Search Sites' ), '', false, false, array( 'id' => 'submit_sites' ) ); ?>
 		</p>
 	</form>
-<?php
+	<?php
 	/**
 	 * Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
 	 *
@@ -510,7 +510,7 @@ function wp_dashboard_quick_press( $error_msg = false ) {
 	}
 
 	$post_ID = (int) $post->ID;
-?>
+	?>
 
 	<form name="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js">
 
@@ -692,7 +692,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 			$actions_string .= "<span class='$action'>$sep$link</span>";
 		}
 	}
-?>
+	?>
 
 		<li id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status( $comment ) ), $comment ); ?>>
 
@@ -702,28 +702,28 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 
 			<div class="dashboard-comment-wrap has-row-actions">
 			<p class="comment-meta">
-			<?php
+				<?php
 				// Comments might not have a post they relate to, e.g. programmatically created ones.
-			if ( $comment_post_link ) {
-				printf(
-					/* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */
-					__( 'From %1$s on %2$s %3$s' ),
-					'<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
-					$comment_post_link,
-					'<span class="approve">' . __( '[Pending]' ) . '</span>'
-				);
-			} else {
-				printf(
-					/* translators: 1: comment author, 2: notification if the comment is pending */
-					__( 'From %1$s %2$s' ),
-					'<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
-					'<span class="approve">' . __( '[Pending]' ) . '</span>'
-				);
-			}
-			?>
+				if ( $comment_post_link ) {
+					printf(
+						/* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */
+						__( 'From %1$s on %2$s %3$s' ),
+						'<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
+						$comment_post_link,
+						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+					);
+				} else {
+					printf(
+						/* translators: 1: comment author, 2: notification if the comment is pending */
+						__( 'From %1$s %2$s' ),
+						'<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
+						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+					);
+				}
+				?>
 			</p>
 
-			<?php
+				<?php
 			else :
 				switch ( $comment->comment_type ) {
 					case 'pingback':
@@ -736,28 +736,28 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 						$type = ucwords( $comment->comment_type );
 				}
 				$type = esc_html( $type );
-			?>
+				?>
 			<div class="dashboard-comment-wrap has-row-actions">
 			<p class="comment-meta">
-			<?php
+				<?php
 				// Pingbacks, Trackbacks or custom comment types might not have a post they relate to, e.g. programmatically created ones.
-			if ( $comment_post_link ) {
-				printf(
-					/* translators: 1: type of comment, 2: post link, 3: notification if the comment is pending */
-					_x( '%1$s on %2$s %3$s', 'dashboard' ),
-					"<strong>$type</strong>",
-					$comment_post_link,
-					'<span class="approve">' . __( '[Pending]' ) . '</span>'
-				);
-			} else {
-				printf(
-					/* translators: 1: type of comment, 2: notification if the comment is pending */
-					_x( '%1$s %2$s', 'dashboard' ),
-					"<strong>$type</strong>",
-					'<span class="approve">' . __( '[Pending]' ) . '</span>'
-				);
-			}
-			?>
+				if ( $comment_post_link ) {
+					printf(
+						/* translators: 1: type of comment, 2: post link, 3: notification if the comment is pending */
+						_x( '%1$s on %2$s %3$s', 'dashboard' ),
+						"<strong>$type</strong>",
+						$comment_post_link,
+						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+					);
+				} else {
+					printf(
+						/* translators: 1: type of comment, 2: notification if the comment is pending */
+						_x( '%1$s %2$s', 'dashboard' ),
+						"<strong>$type</strong>",
+						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+					);
+				}
+				?>
 			</p>
 			<p class="comment-author"><?php comment_author_link( $comment ); ?></p>
 
@@ -768,7 +768,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 			<?php endif; ?>
 			</div>
 		</li>
-<?php
+	<?php
 	$GLOBALS['comment'] = null;
 }
 
@@ -1049,7 +1049,9 @@ function wp_dashboard_trigger_widget_control( $widget_control_id = false ) {
 
 	if ( is_scalar( $widget_control_id ) && $widget_control_id && isset( $wp_dashboard_control_callbacks[ $widget_control_id ] ) && is_callable( $wp_dashboard_control_callbacks[ $widget_control_id ] ) ) {
 		call_user_func(
-			$wp_dashboard_control_callbacks[ $widget_control_id ], '', array(
+			$wp_dashboard_control_callbacks[ $widget_control_id ],
+			'',
+			array(
 				'id'       => $widget_control_id,
 				'callback' => $wp_dashboard_control_callbacks[ $widget_control_id ],
 			)
@@ -1760,7 +1762,8 @@ function wp_welcome_panel() {
 			if ( current_theme_supports( 'widgets' ) && current_theme_supports( 'menus' ) ) {
 				printf(
 					__( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ),
-					admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' )
+					admin_url( 'widgets.php' ),
+					admin_url( 'nav-menus.php' )
 				);
 			} elseif ( current_theme_supports( 'widgets' ) ) {
 				echo '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php
index 9d80b78925..0b3dfdea8c 100644
--- a/wp-admin/includes/export.php
+++ b/wp-admin/includes/export.php
@@ -445,7 +445,7 @@ function export_wp( $args = array() ) {
 <!-- 7. WordPress will then import each of the posts, pages, comments, categories, etc. -->
 <!--    contained in this file into your site. -->
 
-<?php the_generator( 'export' ); ?>
+	<?php the_generator( 'export' ); ?>
 <rss version="2.0"
 	xmlns:excerpt="http://wordpress.org/export/<?php echo WXR_VERSION; ?>/excerpt/"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
@@ -464,9 +464,9 @@ function export_wp( $args = array() ) {
 	<wp:base_site_url><?php echo wxr_site_url(); ?></wp:base_site_url>
 	<wp:base_blog_url><?php bloginfo_rss( 'url' ); ?></wp:base_blog_url>
 
-<?php wxr_authors_list( $post_ids ); ?>
+	<?php wxr_authors_list( $post_ids ); ?>
 
-<?php foreach ( $cats as $c ) : ?>
+	<?php foreach ( $cats as $c ) : ?>
 	<wp:category>
 		<wp:term_id><?php echo intval( $c->term_id ); ?></wp:term_id>
 		<wp:category_nicename><?php echo wxr_cdata( $c->slug ); ?></wp:category_nicename>
@@ -477,8 +477,8 @@ function export_wp( $args = array() ) {
 		wxr_term_meta( $c );
 		?>
 	</wp:category>
-<?php endforeach; ?>
-<?php foreach ( $tags as $t ) : ?>
+	<?php endforeach; ?>
+	<?php foreach ( $tags as $t ) : ?>
 	<wp:tag>
 		<wp:term_id><?php echo intval( $t->term_id ); ?></wp:term_id>
 		<wp:tag_slug><?php echo wxr_cdata( $t->slug ); ?></wp:tag_slug>
@@ -488,8 +488,8 @@ function export_wp( $args = array() ) {
 		wxr_term_meta( $t );
 		?>
 	</wp:tag>
-<?php endforeach; ?>
-<?php foreach ( $terms as $t ) : ?>
+	<?php endforeach; ?>
+	<?php foreach ( $terms as $t ) : ?>
 	<wp:term>
 		<wp:term_id><?php echo wxr_cdata( $t->term_id ); ?></wp:term_id>
 		<wp:term_taxonomy><?php echo wxr_cdata( $t->taxonomy ); ?></wp:term_taxonomy>
@@ -501,43 +501,43 @@ function export_wp( $args = array() ) {
 		wxr_term_meta( $t );
 		?>
 	</wp:term>
-<?php endforeach; ?>
-<?php
-if ( 'all' == $args['content'] ) {
-	wxr_nav_menu_terms();}
-?>
+	<?php endforeach; ?>
+	<?php
+	if ( 'all' == $args['content'] ) {
+		wxr_nav_menu_terms();}
+	?>
 
 	<?php
 	/** This action is documented in wp-includes/feed-rss2.php */
 	do_action( 'rss2_head' );
 	?>
 
-<?php
-if ( $post_ids ) {
-	/**
-	 * @global WP_Query $wp_query
-	 */
-	global $wp_query;
+	<?php
+	if ( $post_ids ) {
+		/**
+		 * @global WP_Query $wp_query
+		 */
+		global $wp_query;
 
-	// Fake being in the loop.
-	$wp_query->in_the_loop = true;
+		// Fake being in the loop.
+		$wp_query->in_the_loop = true;
 
-	// Fetch 20 posts at a time rather than loading the entire table into memory.
-	while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
-		$where = 'WHERE ID IN (' . join( ',', $next_posts ) . ')';
-		$posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
+		// Fetch 20 posts at a time rather than loading the entire table into memory.
+		while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
+			$where = 'WHERE ID IN (' . join( ',', $next_posts ) . ')';
+			$posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
 
-		// Begin Loop.
-		foreach ( $posts as $post ) {
-			setup_postdata( $post );
-			$is_sticky = is_sticky( $post->ID ) ? 1 : 0;
-	?>
+			// Begin Loop.
+			foreach ( $posts as $post ) {
+				setup_postdata( $post );
+				$is_sticky = is_sticky( $post->ID ) ? 1 : 0;
+				?>
 	<item>
 		<title>
-		<?php
-			/** This filter is documented in wp-includes/feed.php */
-			echo apply_filters( 'the_title_rss', $post->post_title );
-		?>
+				<?php
+				/** This filter is documented in wp-includes/feed.php */
+				echo apply_filters( 'the_title_rss', $post->post_title );
+				?>
 		</title>
 		<link><?php the_permalink_rss(); ?></link>
 		<pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>
@@ -545,28 +545,28 @@ if ( $post_ids ) {
 		<guid isPermaLink="false"><?php the_guid(); ?></guid>
 		<description></description>
 		<content:encoded>
-		<?php
-			/**
-			 * Filters the post content used for WXR exports.
-			 *
-			 * @since 2.5.0
-			 *
-			 * @param string $post_content Content of the current post.
-			 */
-			echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) );
-		?>
+				<?php
+				/**
+				 * Filters the post content used for WXR exports.
+				 *
+				 * @since 2.5.0
+				 *
+				 * @param string $post_content Content of the current post.
+				 */
+				echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) );
+				?>
 		</content:encoded>
 		<excerpt:encoded>
-		<?php
-			/**
-			 * Filters the post excerpt used for WXR exports.
-			 *
-			 * @since 2.6.0
-			 *
-			 * @param string $post_excerpt Excerpt for the current post.
-			 */
-			echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) );
-		?>
+				<?php
+				/**
+				 * Filters the post excerpt used for WXR exports.
+				 *
+				 * @since 2.6.0
+				 *
+				 * @param string $post_excerpt Excerpt for the current post.
+				 */
+				echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) );
+				?>
 		</excerpt:encoded>
 		<wp:post_id><?php echo intval( $post->ID ); ?></wp:post_id>
 		<wp:post_date><?php echo wxr_cdata( $post->post_date ); ?></wp:post_date>
@@ -580,40 +580,40 @@ if ( $post_ids ) {
 		<wp:post_type><?php echo wxr_cdata( $post->post_type ); ?></wp:post_type>
 		<wp:post_password><?php echo wxr_cdata( $post->post_password ); ?></wp:post_password>
 		<wp:is_sticky><?php echo intval( $is_sticky ); ?></wp:is_sticky>
-	<?php	if ( $post->post_type == 'attachment' ) : ?>
+				<?php	if ( $post->post_type == 'attachment' ) : ?>
 		<wp:attachment_url><?php echo wxr_cdata( wp_get_attachment_url( $post->ID ) ); ?></wp:attachment_url>
 	<?php endif; ?>
-	<?php wxr_post_taxonomy(); ?>
-	<?php
-	$postmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
-	foreach ( $postmeta as $meta ) :
-		/**
-		 * Filters whether to selectively skip post meta used for WXR exports.
-		 *
-		 * Returning a truthy value to the filter will skip the current meta
-		 * object from being exported.
-		 *
-		 * @since 3.3.0
-		 *
-		 * @param bool   $skip     Whether to skip the current post meta. Default false.
-		 * @param string $meta_key Current meta key.
-		 * @param object $meta     Current meta object.
-		 */
-		if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) ) {
-			continue;
-		}
-		?>
+				<?php wxr_post_taxonomy(); ?>
+				<?php
+				$postmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
+				foreach ( $postmeta as $meta ) :
+					/**
+					 * Filters whether to selectively skip post meta used for WXR exports.
+					 *
+					 * Returning a truthy value to the filter will skip the current meta
+					 * object from being exported.
+					 *
+					 * @since 3.3.0
+					 *
+					 * @param bool   $skip     Whether to skip the current post meta. Default false.
+					 * @param string $meta_key Current meta key.
+					 * @param object $meta     Current meta object.
+					 */
+					if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) ) {
+						continue;
+					}
+					?>
 		<wp:postmeta>
 		<wp:meta_key><?php echo wxr_cdata( $meta->meta_key ); ?></wp:meta_key>
 		<wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
 		</wp:postmeta>
-<?php
-endforeach;
+					<?php
+	endforeach;
 
-		$_comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) );
-		$comments  = array_map( 'get_comment', $_comments );
-	foreach ( $comments as $c ) :
-		?>
+				$_comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) );
+				$comments  = array_map( 'get_comment', $_comments );
+				foreach ( $comments as $c ) :
+					?>
 		<wp:comment>
 			<wp:comment_id><?php echo intval( $c->comment_ID ); ?></wp:comment_id>
 			<wp:comment_author><?php echo wxr_cdata( $c->comment_author ); ?></wp:comment_author>
@@ -627,39 +627,39 @@ endforeach;
 			<wp:comment_type><?php echo wxr_cdata( $c->comment_type ); ?></wp:comment_type>
 			<wp:comment_parent><?php echo intval( $c->comment_parent ); ?></wp:comment_parent>
 			<wp:comment_user_id><?php echo intval( $c->user_id ); ?></wp:comment_user_id>
-<?php
-  $c_meta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID ) );
-foreach ( $c_meta as $meta ) :
-	/**
-	 * Filters whether to selectively skip comment meta used for WXR exports.
-	 *
-	 * Returning a truthy value to the filter will skip the current meta
-	 * object from being exported.
-	 *
-	 * @since 4.0.0
-	 *
-	 * @param bool   $skip     Whether to skip the current comment meta. Default false.
-	 * @param string $meta_key Current meta key.
-	 * @param object $meta     Current meta object.
-	 */
-	if ( apply_filters( 'wxr_export_skip_commentmeta', false, $meta->meta_key, $meta ) ) {
-		continue;
-	}
-	?>
+					<?php
+					$c_meta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID ) );
+					foreach ( $c_meta as $meta ) :
+						/**
+						 * Filters whether to selectively skip comment meta used for WXR exports.
+						 *
+						 * Returning a truthy value to the filter will skip the current meta
+						 * object from being exported.
+						 *
+						 * @since 4.0.0
+						 *
+						 * @param bool   $skip     Whether to skip the current comment meta. Default false.
+						 * @param string $meta_key Current meta key.
+						 * @param object $meta     Current meta object.
+						 */
+						if ( apply_filters( 'wxr_export_skip_commentmeta', false, $meta->meta_key, $meta ) ) {
+							continue;
+						}
+						?>
 	<wp:commentmeta>
 	<wp:meta_key><?php echo wxr_cdata( $meta->meta_key ); ?></wp:meta_key>
 			<wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
 			</wp:commentmeta>
-<?php	endforeach; ?>
+					<?php	endforeach; ?>
 		</wp:comment>
-<?php	endforeach; ?>
+			<?php	endforeach; ?>
 		</item>
-	<?php
+				<?php
+			}
 		}
 	}
-}
-?>
+	?>
 </channel>
 </rss>
-<?php
+	<?php
 }
diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 7fd8c0cd49..b5f22cdb4f 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -890,11 +890,13 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
 	 * @param string $context The type of upload action. Values include 'upload' or 'sideload'.
 	 */
 	return apply_filters(
-		'wp_handle_upload', array(
+		'wp_handle_upload',
+		array(
 			'file' => $new_file,
 			'url'  => $url,
 			'type' => $type,
-		), 'wp_handle_sideload' === $action ? 'sideload' : 'upload'
+		),
+		'wp_handle_sideload' === $action ? 'sideload' : 'upload'
 	);
 }
 
@@ -982,7 +984,8 @@ function download_url( $url, $timeout = 300 ) {
 	}
 
 	$response = wp_safe_remote_get(
-		$url, array(
+		$url,
+		array(
 			'timeout'  => $timeout,
 			'stream'   => true,
 			'filename' => $tmpfname,
@@ -1679,7 +1682,8 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
 	}
 
 	$credentials = get_option(
-		'ftp_credentials', array(
+		'ftp_credentials',
+		array(
 			'hostname' => '',
 			'username' => '',
 		)
@@ -1786,35 +1790,35 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
 	 */
 	$types = apply_filters( 'fs_ftp_connection_types', $types, $credentials, $type, $error, $context );
 
-?>
+	?>
 <form action="<?php echo esc_url( $form_post ); ?>" method="post">
 <div id="request-filesystem-credentials-form" class="request-filesystem-credentials-form">
-<?php
-// Print a H1 heading in the FTP credentials modal dialog, default is a H2.
-$heading_tag = 'h2';
-if ( 'plugins.php' === $pagenow || 'plugin-install.php' === $pagenow ) {
-	$heading_tag = 'h1';
-}
-echo "<$heading_tag id='request-filesystem-credentials-title'>" . __( 'Connection Information' ) . "</$heading_tag>";
-?>
+	<?php
+	// Print a H1 heading in the FTP credentials modal dialog, default is a H2.
+	$heading_tag = 'h2';
+	if ( 'plugins.php' === $pagenow || 'plugin-install.php' === $pagenow ) {
+		$heading_tag = 'h1';
+	}
+	echo "<$heading_tag id='request-filesystem-credentials-title'>" . __( 'Connection Information' ) . "</$heading_tag>";
+	?>
 <p id="request-filesystem-credentials-desc">
-<?php
+	<?php
 	$label_user = __( 'Username' );
 	$label_pass = __( 'Password' );
 	_e( 'To perform the requested action, WordPress needs to access your web server.' );
 	echo ' ';
-if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
-	if ( isset( $types['ssh'] ) ) {
-		_e( 'Please enter your FTP or SSH credentials to proceed.' );
-		$label_user = __( 'FTP/SSH Username' );
-		$label_pass = __( 'FTP/SSH Password' );
-	} else {
-		_e( 'Please enter your FTP credentials to proceed.' );
-		$label_user = __( 'FTP Username' );
-		$label_pass = __( 'FTP Password' );
+	if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
+		if ( isset( $types['ssh'] ) ) {
+			_e( 'Please enter your FTP or SSH credentials to proceed.' );
+			$label_user = __( 'FTP/SSH Username' );
+			$label_pass = __( 'FTP/SSH Password' );
+		} else {
+			_e( 'Please enter your FTP credentials to proceed.' );
+			$label_user = __( 'FTP Username' );
+			$label_pass = __( 'FTP Password' );
+		}
+		echo ' ';
 	}
-	echo ' ';
-}
 	_e( 'If you do not remember your credentials, you should contact your web host.' );
 
 	$hostname_value = esc_attr( $hostname );
@@ -1826,7 +1830,7 @@ if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
 	if ( defined( 'FTP_PASS' ) ) {
 		$password_value = '*****';
 	}
-?>
+	?>
 </p>
 <label for="hostname">
 	<span class="field-title"><?php _e( 'Hostname' ); ?></span>
@@ -1846,31 +1850,31 @@ if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
 		<?php
 		if ( ! defined( 'FTP_PASS' ) ) {
 			_e( 'This password will not be stored on the server.' );}
-?>
+		?>
 </em>
 	</label>
 </div>
 <fieldset>
 <legend><?php _e( 'Connection Type' ); ?></legend>
-<?php
+	<?php
 	$disabled = disabled( ( defined( 'FTP_SSL' ) && FTP_SSL ) || ( defined( 'FTP_SSH' ) && FTP_SSH ), true, false );
-foreach ( $types as $name => $text ) :
-	?>
+	foreach ( $types as $name => $text ) :
+		?>
 	<label for="<?php echo esc_attr( $name ); ?>">
 		<input type="radio" name="connection_type" id="<?php echo esc_attr( $name ); ?>" value="<?php echo esc_attr( $name ); ?>" <?php checked( $name, $connection_type ); ?> <?php echo $disabled; ?> />
 		<?php echo $text; ?>
 	</label>
-<?php
+		<?php
 	endforeach;
-?>
+	?>
 </fieldset>
-<?php
-if ( isset( $types['ssh'] ) ) {
-	$hidden_class = '';
-	if ( 'ssh' != $connection_type || empty( $connection_type ) ) {
-		$hidden_class = ' class="hidden"';
-	}
-?>
+	<?php
+	if ( isset( $types['ssh'] ) ) {
+		$hidden_class = '';
+		if ( 'ssh' != $connection_type || empty( $connection_type ) ) {
+			$hidden_class = ' class="hidden"';
+		}
+		?>
 <fieldset id="ssh-keys"<?php echo $hidden_class; ?>>
 <legend><?php _e( 'Authentication Keys' ); ?></legend>
 <label for="public_key">
@@ -1883,15 +1887,15 @@ if ( isset( $types['ssh'] ) ) {
 </label>
 <p id="auth-keys-desc"><?php _e( 'Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.' ); ?></p>
 </fieldset>
-<?php
-}
-
-foreach ( (array) $extra_fields as $field ) {
-	if ( isset( $submitted_form[ $field ] ) ) {
-		echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( $submitted_form[ $field ] ) . '" />';
+		<?php
 	}
-}
-?>
+
+	foreach ( (array) $extra_fields as $field ) {
+		if ( isset( $submitted_form[ $field ] ) ) {
+			echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( $submitted_form[ $field ] ) . '" />';
+		}
+	}
+	?>
 	<p class="request-filesystem-credentials-action-buttons">
 		<?php wp_nonce_field( 'filesystem-credentials', '_fs_nonce', false, true ); ?>
 		<button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>
@@ -1899,7 +1903,7 @@ foreach ( (array) $extra_fields as $field ) {
 	</p>
 </div>
 </form>
-<?php
+	<?php
 	return false;
 }
 
@@ -1953,11 +1957,11 @@ function wp_print_request_filesystem_credentials_modal() {
  */
 function wp_privacy_generate_personal_data_export_group_html( $group_data ) {
 	$allowed_tags      = array(
-		'a' => array(
+		'a'  => array(
 			'href'   => array(),
-			'target' => array()
+			'target' => array(),
 		),
-		'br' => array()
+		'br' => array(),
 	);
 	$allowed_protocols = array( 'http', 'https' );
 	$group_html        = '';
@@ -2041,7 +2045,7 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) {
 	$file_basename        = 'wp-personal-data-file-' . $stripped_email . '-' . $obscura;
 	$html_report_filename = $file_basename . '.html';
 	$html_report_pathname = wp_normalize_path( $exports_dir . $html_report_filename );
-	$file = fopen( $html_report_pathname, 'w' );
+	$file                 = fopen( $html_report_pathname, 'w' );
 	if ( false === $file ) {
 		wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );
 	}
@@ -2060,22 +2064,22 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) {
 	fwrite( $file, "<head>\n" );
 	fwrite( $file, "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n" );
 	fwrite( $file, "<style type='text/css'>" );
-	fwrite( $file, "body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }" );
-	fwrite( $file, "table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }" );
-	fwrite( $file, "th { padding: 5px; text-align: left; width: 20%; }" );
-	fwrite( $file, "td { padding: 5px; }" );
-	fwrite( $file, "tr:nth-child(odd) { background-color: #fafafa; }" );
-	fwrite( $file, "</style>" );
-	fwrite( $file, "<title>" );
+	fwrite( $file, 'body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }' );
+	fwrite( $file, 'table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }' );
+	fwrite( $file, 'th { padding: 5px; text-align: left; width: 20%; }' );
+	fwrite( $file, 'td { padding: 5px; }' );
+	fwrite( $file, 'tr:nth-child(odd) { background-color: #fafafa; }' );
+	fwrite( $file, '</style>' );
+	fwrite( $file, '<title>' );
 	fwrite( $file, esc_html( $title ) );
-	fwrite( $file, "</title>" );
+	fwrite( $file, '</title>' );
 	fwrite( $file, "</head>\n" );
 
 	// Body.
 	fwrite( $file, "<body>\n" );
 
 	// Heading.
-	fwrite( $file, "<h1>" . esc_html__( 'Personal Data Export' ) . "</h1>" );
+	fwrite( $file, '<h1>' . esc_html__( 'Personal Data Export' ) . '</h1>' );
 
 	// And now, all the Groups.
 	$groups = get_post_meta( $request_id, '_export_data_grouped', true );
@@ -2197,9 +2201,9 @@ function wp_privacy_send_personal_data_export_email( $request_id ) {
 	$expiration      = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
 	$expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
 
-/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
-$email_text = __(
-'Howdy,
+	/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
+	$email_text = __(
+		'Howdy,
 
 Your request for an export of personal data has been completed. You may
 download your personal data by clicking on the link below. For privacy
@@ -2211,7 +2215,7 @@ so please download it before then.
 Regards,
 All at ###SITENAME###
 ###SITEURL###'
-);
+	);
 
 	/**
 	 * Filters the text of the email sent with a personal data export file.
@@ -2229,10 +2233,10 @@ All at ###SITENAME###
 	 */
 	$content = apply_filters( 'wp_privacy_personal_data_email_content', $email_text, $request_id );
 
-	$email_address = $request->email;
+	$email_address   = $request->email;
 	$export_file_url = get_post_meta( $request_id, '_export_file_url', true );
-	$site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-	$site_url = home_url();
+	$site_name       = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+	$site_url        = home_url();
 
 	$content = str_replace( '###EXPIRATION###', $expiration_date, $content );
 	$content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content );
@@ -2313,9 +2317,9 @@ function wp_privacy_process_personal_data_export_page( $response, $exporter_inde
 
 	// If we are not yet on the last page of the last exporter, return now.
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
-	$exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
+	$exporters        = apply_filters( 'wp_privacy_personal_data_exporters', array() );
 	$is_last_exporter = $exporter_index === count( $exporters );
-	$exporter_done = $response['done'];
+	$exporter_done    = $response['done'];
 	if ( ! $is_last_exporter || ! $exporter_done ) {
 		return $response;
 	}
@@ -2339,8 +2343,8 @@ function wp_privacy_process_personal_data_export_page( $response, $exporter_inde
 			$groups[ $group_id ]['items'][ $item_id ] = array();
 		}
 
-		$old_item_data = $groups[ $group_id ]['items'][ $item_id ];
-		$merged_item_data = array_merge( $export_datum['data'], $old_item_data );
+		$old_item_data                            = $groups[ $group_id ]['items'][ $item_id ];
+		$merged_item_data                         = array_merge( $export_datum['data'], $old_item_data );
 		$groups[ $group_id ]['items'][ $item_id ] = $merged_item_data;
 	}
 
diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php
index 84ac3da933..740405d328 100644
--- a/wp-admin/includes/image-edit.php
+++ b/wp-admin/includes/image-edit.php
@@ -80,7 +80,7 @@ function wp_image_editor( $post_id, $msg = false ) {
 	</div>
 	</div>
 
-<?php if ( $can_restore ) { ?>
+	<?php if ( $can_restore ) { ?>
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
@@ -103,7 +103,7 @@ function wp_image_editor( $post_id, $msg = false ) {
 	</div>
 	</div>
 
-<?php } ?>
+	<?php } ?>
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
@@ -152,7 +152,7 @@ function wp_image_editor( $post_id, $msg = false ) {
 	<?php
 	if ( $thumb && $sub_sizes ) {
 		$thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
-	?>
+		?>
 
 	<div class="imgedit-group imgedit-applyto">
 	<div class="imgedit-group-top">
@@ -203,13 +203,13 @@ function wp_image_editor( $post_id, $msg = false ) {
 																			)
 																		) ) {
 																			$note_no_rotate = '';
-																	?>
+																			?>
 																		<button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate counter-clockwise' ); ?></span></button>
 			<button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate clockwise' ); ?></span></button>
-																<?php
+																			<?php
 																		} else {
 																					$note_no_rotate = '<p class="note-no-rotate"><em>' . __( 'Image rotation is not supported by your web host.' ) . '</em></p>';
-																		?>
+																			?>
 																				<button type="button" class="imgedit-rleft button disabled" disabled></button>
 																				<button type="button" class="imgedit-rright button disabled" disabled></button>
 																		<?php } ?>
@@ -243,7 +243,7 @@ function wp_image_editor( $post_id, $msg = false ) {
 	<div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
 	<div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e( "There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor." ); ?></div>
 	</div>
-<?php
+	<?php
 }
 
 /**
diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
index 3bd7059b30..254ba7d90f 100644
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -437,7 +437,7 @@ function wp_read_image_metadata( $file ) {
 		}
 	}
 
-	$exif = array(); 
+	$exif = array();
 
 	/**
 	 * Filters the image types to check for exif data.
diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php
index 787ce596eb..e050a43fe3 100644
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -141,7 +141,8 @@ function wp_get_popular_importers() {
 			array(
 				'locale'  => $locale,
 				'version' => $wp_version,
-			), 'http://api.wordpress.org/core/importers/1.1/'
+			),
+			'http://api.wordpress.org/core/importers/1.1/'
 		);
 		$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
 
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index c941e625e3..e6fc3d558e 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -263,12 +263,12 @@ function _cleanup_image_add_caption( $matches ) {
  * @param string $html
  */
 function media_send_to_editor( $html ) {
-?>
+	?>
 <script type="text/javascript">
 var win = window.dialogArguments || opener || parent || top;
 win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
 </script>
-<?php
+	<?php
 	exit;
 }
 
@@ -368,7 +368,7 @@ function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrid
 			$content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
 		}
 
-	// Use image exif/iptc data for title and caption defaults if possible.
+		// Use image exif/iptc data for title and caption defaults if possible.
 	} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = wp_read_image_metadata( $file ) ) {
 		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
 			$title = $image_meta['title'];
@@ -388,7 +388,8 @@ function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrid
 			'post_title'     => $title,
 			'post_content'   => $content,
 			'post_excerpt'   => $excerpt,
-		), $post_data
+		),
+		$post_data
 	);
 
 	// This should never be set as it would then overwrite an existing attachment.
@@ -458,7 +459,8 @@ function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data
 			'post_parent'    => $post_id,
 			'post_title'     => $title,
 			'post_content'   => $content,
-		), $post_data
+		),
+		$post_data
 	);
 
 	// This should never be set as it would then overwrite an existing attachment.
@@ -484,24 +486,24 @@ function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data
  */
 function wp_iframe( $content_func /* ... */ ) {
 	_wp_admin_html_begin();
-?>
+	?>
 <title><?php bloginfo( 'name' ); ?> &rsaquo; <?php _e( 'Uploads' ); ?> &#8212; <?php _e( 'WordPress' ); ?></title>
-<?php
+	<?php
 
-wp_enqueue_style( 'colors' );
-// Check callback name for 'media'
-if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
+	wp_enqueue_style( 'colors' );
+	// Check callback name for 'media'
+	if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
 	|| ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) ) {
-	wp_enqueue_style( 'deprecated-media' );
-}
-wp_enqueue_style( 'ie' );
-?>
+		wp_enqueue_style( 'deprecated-media' );
+	}
+	wp_enqueue_style( 'ie' );
+	?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
 isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
-<?php
+	<?php
 	/** This action is documented in wp-admin/admin-header.php */
 	do_action( 'admin_enqueue_scripts', 'media-upload-popup' );
 
@@ -536,43 +538,43 @@ isRtl = <?php echo (int) is_rtl(); ?>;
 	/** This action is documented in wp-admin/admin-header.php */
 	do_action( 'admin_head' );
 
-if ( is_string( $content_func ) ) {
-	/**
-	 * Fires in the admin header for each specific form tab in the legacy
-	 * (pre-3.5.0) media upload popup.
-	 *
-	 * The dynamic portion of the hook, `$content_func`, refers to the form
-	 * callback for the media upload type. Possible values include
-	 * 'media_upload_type_form', 'media_upload_type_url_form', and
-	 * 'media_upload_library_form'.
-	 *
-	 * @since 2.5.0
-	 */
-	do_action( "admin_head_{$content_func}" );
-}
+	if ( is_string( $content_func ) ) {
+		/**
+		 * Fires in the admin header for each specific form tab in the legacy
+		 * (pre-3.5.0) media upload popup.
+		 *
+		 * The dynamic portion of the hook, `$content_func`, refers to the form
+		 * callback for the media upload type. Possible values include
+		 * 'media_upload_type_form', 'media_upload_type_url_form', and
+		 * 'media_upload_library_form'.
+		 *
+		 * @since 2.5.0
+		 */
+		do_action( "admin_head_{$content_func}" );
+	}
 
-$body_id_attr = '';
-if ( isset( $GLOBALS['body_id'] ) ) {
-	$body_id_attr = ' id="' . $GLOBALS['body_id'] . '"';
-}
-?>
+	$body_id_attr = '';
+	if ( isset( $GLOBALS['body_id'] ) ) {
+		$body_id_attr = ' id="' . $GLOBALS['body_id'] . '"';
+	}
+	?>
 </head>
 <body<?php echo $body_id_attr; ?> class="wp-core-ui no-js">
 <script type="text/javascript">
 document.body.className = document.body.className.replace('no-js', 'js');
 </script>
-<?php
+	<?php
 	$args = func_get_args();
 	$args = array_slice( $args, 1 );
 	call_user_func_array( $content_func, $args );
 
 	/** This action is documented in wp-admin/admin-footer.php */
 	do_action( 'admin_print_footer_scripts' );
-?>
+	?>
 <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
 </body>
 </html>
-<?php
+	<?php
 }
 
 /**
@@ -754,7 +756,7 @@ function media_upload_form_handler() {
 	}
 
 	if ( isset( $_POST['insert-gallery'] ) || isset( $_POST['update-gallery'] ) ) {
-	?>
+		?>
 		<script type="text/javascript">
 		var win = window.dialogArguments || opener || parent || top;
 		win.tb_remove();
@@ -1069,7 +1071,8 @@ function image_size_input_fields( $post, $check = '' ) {
 	 *                          include 'Thumbnail', 'Medium', 'Large', 'Full Size'.
 	 */
 	$size_names = apply_filters(
-		'image_size_names_choose', array(
+		'image_size_names_choose',
+		array(
 			'thumbnail' => __( 'Thumbnail' ),
 			'medium'    => __( 'Medium' ),
 			'large'     => __( 'Large' ),
@@ -1781,9 +1784,15 @@ function get_compat_media_markup( $attachment_id, $args = null ) {
 	$form_fields = apply_filters( 'attachment_fields_to_edit', $form_fields, $post );
 
 	unset(
-		$form_fields['image-size'], $form_fields['align'], $form_fields['image_alt'],
-		$form_fields['post_title'], $form_fields['post_excerpt'], $form_fields['post_content'],
-		$form_fields['url'], $form_fields['menu_order'], $form_fields['image_url']
+		$form_fields['image-size'],
+		$form_fields['align'],
+		$form_fields['image_alt'],
+		$form_fields['post_title'],
+		$form_fields['post_excerpt'],
+		$form_fields['post_content'],
+		$form_fields['url'],
+		$form_fields['menu_order'],
+		$form_fields['image_url']
 	);
 
 	/** This filter is documented in wp-admin/includes/media.php */
@@ -1943,123 +1952,123 @@ function media_upload_form( $errors = null ) {
 	if ( ! $max_upload_size ) {
 		$max_upload_size = 0;
 	}
-?>
+	?>
 
 <div id="media-upload-notice">
-<?php
+	<?php
 
-if ( isset( $errors['upload_notice'] ) ) {
-	echo $errors['upload_notice'];
-}
+	if ( isset( $errors['upload_notice'] ) ) {
+		echo $errors['upload_notice'];
+	}
 
-?>
+	?>
 </div>
 <div id="media-upload-error">
-<?php
+	<?php
 
-if ( isset( $errors['upload_error'] ) && is_wp_error( $errors['upload_error'] ) ) {
-	echo $errors['upload_error']->get_error_message();
-}
+	if ( isset( $errors['upload_error'] ) && is_wp_error( $errors['upload_error'] ) ) {
+		echo $errors['upload_error']->get_error_message();
+	}
 
-?>
+	?>
 </div>
-<?php
-if ( is_multisite() && ! is_upload_space_available() ) {
+	<?php
+	if ( is_multisite() && ! is_upload_space_available() ) {
+		/**
+		 * Fires when an upload will exceed the defined upload space quota for a network site.
+		 *
+		 * @since 3.5.0
+		 */
+		do_action( 'upload_ui_over_quota' );
+		return;
+	}
+
 	/**
-	 * Fires when an upload will exceed the defined upload space quota for a network site.
+	 * Fires just before the legacy (pre-3.5.0) upload interface is loaded.
 	 *
-	 * @since 3.5.0
+	 * @since 2.6.0
 	 */
-	do_action( 'upload_ui_over_quota' );
-	return;
-}
+	do_action( 'pre-upload-ui' );
 
-/**
- * Fires just before the legacy (pre-3.5.0) upload interface is loaded.
- *
- * @since 2.6.0
- */
-do_action( 'pre-upload-ui' );
+	$post_params = array(
+		'post_id'  => $post_id,
+		'_wpnonce' => wp_create_nonce( 'media-form' ),
+		'type'     => $_type,
+		'tab'      => $_tab,
+		'short'    => '1',
+	);
 
-$post_params = array(
-	'post_id'  => $post_id,
-	'_wpnonce' => wp_create_nonce( 'media-form' ),
-	'type'     => $_type,
-	'tab'      => $_tab,
-	'short'    => '1',
-);
+	/**
+	 * Filters the media upload post parameters.
+	 *
+	 * @since 3.1.0 As 'swfupload_post_params'
+	 * @since 3.3.0
+	 *
+	 * @param array $post_params An array of media upload parameters used by Plupload.
+	 */
+	$post_params = apply_filters( 'upload_post_params', $post_params );
 
-/**
- * Filters the media upload post parameters.
- *
- * @since 3.1.0 As 'swfupload_post_params'
- * @since 3.3.0
- *
- * @param array $post_params An array of media upload parameters used by Plupload.
- */
-$post_params = apply_filters( 'upload_post_params', $post_params );
+	/*
+	* Since 4.9 the `runtimes` setting is hardcoded in our version of Plupload to `html5,html4`,
+	* and the `flash_swf_url` and `silverlight_xap_url` are not used.
+	*/
+	$plupload_init = array(
+		'browse_button'    => 'plupload-browse-button',
+		'container'        => 'plupload-upload-ui',
+		'drop_element'     => 'drag-drop-area',
+		'file_data_name'   => 'async-upload',
+		'url'              => $upload_action_url,
+		'filters'          => array(
+			'max_file_size' => $max_upload_size . 'b',
+		),
+		'multipart_params' => $post_params,
+	);
 
-/*
- * Since 4.9 the `runtimes` setting is hardcoded in our version of Plupload to `html5,html4`,
- * and the `flash_swf_url` and `silverlight_xap_url` are not used.
- */
-$plupload_init = array(
-	'browse_button'    => 'plupload-browse-button',
-	'container'        => 'plupload-upload-ui',
-	'drop_element'     => 'drag-drop-area',
-	'file_data_name'   => 'async-upload',
-	'url'              => $upload_action_url,
-	'filters'          => array(
-		'max_file_size' => $max_upload_size . 'b',
-	),
-	'multipart_params' => $post_params,
-);
-
-// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
-// when enabled. See #29602.
-if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
+	// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
+	// when enabled. See #29602.
+	if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
 	strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
 
-	$plupload_init['multi_selection'] = false;
-}
+		$plupload_init['multi_selection'] = false;
+	}
 
-/**
- * Filters the default Plupload settings.
- *
- * @since 3.3.0
- *
- * @param array $plupload_init An array of default settings used by Plupload.
- */
-$plupload_init = apply_filters( 'plupload_init', $plupload_init );
+	/**
+	 * Filters the default Plupload settings.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @param array $plupload_init An array of default settings used by Plupload.
+	 */
+	$plupload_init = apply_filters( 'plupload_init', $plupload_init );
 
-?>
+	?>
 
 <script type="text/javascript">
-<?php
-// Verify size is an int. If not return default value.
-$large_size_h = absint( get_option( 'large_size_h' ) );
-if ( ! $large_size_h ) {
-	$large_size_h = 1024;
-}
-$large_size_w = absint( get_option( 'large_size_w' ) );
-if ( ! $large_size_w ) {
-	$large_size_w = 1024;
-}
-?>
+	<?php
+	// Verify size is an int. If not return default value.
+	$large_size_h = absint( get_option( 'large_size_h' ) );
+	if ( ! $large_size_h ) {
+		$large_size_h = 1024;
+	}
+	$large_size_w = absint( get_option( 'large_size_w' ) );
+	if ( ! $large_size_w ) {
+		$large_size_w = 1024;
+	}
+	?>
 var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
 wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
 </script>
 
 <div id="plupload-upload-ui" class="hide-if-no-js">
-<?php
-/**
- * Fires before the upload interface loads.
- *
- * @since 2.6.0 As 'pre-flash-upload-ui'
- * @since 3.3.0
- */
-do_action( 'pre-plupload-upload-ui' );
-?>
+	<?php
+	/**
+	 * Fires before the upload interface loads.
+	 *
+	 * @since 2.6.0 As 'pre-flash-upload-ui'
+	 * @since 3.3.0
+	 */
+	do_action( 'pre-plupload-upload-ui' );
+	?>
 <div id="drag-drop-area">
 	<div class="drag-drop-inside">
 	<p class="drag-drop-info"><?php _e( 'Drop files here' ); ?></p>
@@ -2067,15 +2076,15 @@ do_action( 'pre-plupload-upload-ui' );
 	<p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e( 'Select Files' ); ?>" class="button" /></p>
 	</div>
 </div>
-<?php
-/**
- * Fires after the upload interface loads.
- *
- * @since 2.6.0 As 'post-flash-upload-ui'
- * @since 3.3.0
- */
-do_action( 'post-plupload-upload-ui' );
-?>
+	<?php
+	/**
+	 * Fires after the upload interface loads.
+	 *
+	 * @since 2.6.0 As 'post-flash-upload-ui'
+	 * @since 3.3.0
+	 */
+	do_action( 'post-plupload-upload-ui' );
+	?>
 </div>
 
 <div id="html-upload-ui" class="hide-if-js">
@@ -2094,18 +2103,18 @@ do_action( 'post-plupload-upload-ui' );
 		<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e( 'Cancel' ); ?></a>
 	</p>
 	<div class="clear"></div>
-<?php
-/**
- * Fires after the upload button in the media upload interface.
- *
- * @since 2.6.0
- */
-do_action( 'post-html-upload-ui' );
-?>
+	<?php
+	/**
+	 * Fires after the upload button in the media upload interface.
+	 *
+	 * @since 2.6.0
+	 */
+	do_action( 'post-html-upload-ui' );
+	?>
 </div>
 
 <p class="max-upload-size"><?php printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); ?></p>
-<?php
+	<?php
 
 	/**
 	 * Fires on the post upload UI screen.
@@ -2148,16 +2157,16 @@ function media_upload_type_form( $type = 'file', $errors = null, $id = null ) {
 	if ( get_user_setting( 'uploader' ) ) {
 		$form_class .= ' html-uploader';
 	}
-?>
+	?>
 
 <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
-<?php submit_button( '', 'hidden', 'save', false ); ?>
+	<?php submit_button( '', 'hidden', 'save', false ); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-<?php wp_nonce_field( 'media-form' ); ?>
+	<?php wp_nonce_field( 'media-form' ); ?>
 
 <h3 class="media-title"><?php _e( 'Add media files from your computer' ); ?></h3>
 
-<?php media_upload_form( $errors ); ?>
+	<?php media_upload_form( $errors ); ?>
 
 <script type="text/javascript">
 jQuery(function($){
@@ -2169,25 +2178,25 @@ jQuery(function($){
 });
 </script>
 <div id="media-items">
-<?php
+	<?php
 
-if ( $id ) {
-	if ( ! is_wp_error( $id ) ) {
-		add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 );
-		echo get_media_items( $id, $errors );
-	} else {
-		echo '<div id="media-upload-error">' . esc_html( $id->get_error_message() ) . '</div></div>';
-		exit;
+	if ( $id ) {
+		if ( ! is_wp_error( $id ) ) {
+			add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 );
+			echo get_media_items( $id, $errors );
+		} else {
+			echo '<div id="media-upload-error">' . esc_html( $id->get_error_message() ) . '</div></div>';
+			exit;
+		}
 	}
-}
-?>
+	?>
 </div>
 
 <p class="savebutton ml-submit">
-<?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
+	<?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
 </p>
 </form>
-<?php
+	<?php
 }
 
 /**
@@ -2216,11 +2225,11 @@ function media_upload_type_url_form( $type = null, $errors = null, $id = null )
 	if ( get_user_setting( 'uploader' ) ) {
 		$form_class .= ' html-uploader';
 	}
-?>
+	?>
 
 <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-<?php wp_nonce_field( 'media-form' ); ?>
+	<?php wp_nonce_field( 'media-form' ); ?>
 
 <h3 class="media-title"><?php _e( 'Insert media from another website' ); ?></h3>
 
@@ -2240,10 +2249,10 @@ var addExtImage = {
 		if ( f.alt.value )
 			alt = f.alt.value.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
-<?php
+	<?php
 	/** This filter is documented in wp-admin/includes/media.php */
-if ( ! apply_filters( 'disable_captions', '' ) ) {
-	?>
+	if ( ! apply_filters( 'disable_captions', '' ) ) {
+		?>
 	if ( f.caption.value ) {
 		caption = f.caption.value.replace(/\r\n|\r/g, '\n');
 		caption = caption.replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g, function(a){
@@ -2252,7 +2261,7 @@ if ( ! apply_filters( 'disable_captions', '' ) ) {
 
 		caption = caption.replace(/\s*\n\s*/g, '<br />');
 	}
-<?php } ?>
+	<?php } ?>
 
 		cls = caption ? '' : ' class="'+t.align+'"';
 
@@ -2318,20 +2327,20 @@ jQuery(document).ready( function($) {
 
 <div id="media-items">
 <div class="media-item media-blank">
-<?php
-/**
- * Filters the insert media from URL form HTML.
- *
- * @since 3.3.0
- *
- * @param string $form_html The insert from URL form HTML.
- */
-echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) );
-?>
+	<?php
+	/**
+	 * Filters the insert media from URL form HTML.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @param string $form_html The insert from URL form HTML.
+	 */
+	echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) );
+	?>
 </div>
 </div>
 </form>
-<?php
+	<?php
 }
 
 /**
@@ -2360,7 +2369,7 @@ function media_upload_gallery_form( $errors ) {
 	if ( get_user_setting( 'uploader' ) ) {
 		$form_class .= ' html-uploader';
 	}
-?>
+	?>
 
 <script type="text/javascript">
 jQuery(function($){
@@ -2373,18 +2382,18 @@ jQuery(function($){
 </script>
 <div id="sort-buttons" class="hide-if-no-js">
 <span>
-<?php _e( 'All Tabs:' ); ?>
+	<?php _e( 'All Tabs:' ); ?>
 <a href="#" id="showall"><?php _e( 'Show' ); ?></a>
 <a href="#" id="hideall" style="display:none;"><?php _e( 'Hide' ); ?></a>
 </span>
-<?php _e( 'Sort Order:' ); ?>
+	<?php _e( 'Sort Order:' ); ?>
 <a href="#" id="asc"><?php _e( 'Ascending' ); ?></a> |
 <a href="#" id="desc"><?php _e( 'Descending' ); ?></a> |
 <a href="#" id="clear"><?php _ex( 'Clear', 'verb' ); ?></a>
 </div>
 <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
-<?php wp_nonce_field( 'media-form' ); ?>
-<?php //media_upload_form( $errors ); ?>
+	<?php wp_nonce_field( 'media-form' ); ?>
+	<?php //media_upload_form( $errors ); ?>
 <table class="widefat">
 <thead><tr>
 <th><?php _e( 'Media' ); ?></th>
@@ -2393,19 +2402,23 @@ jQuery(function($){
 </tr></thead>
 </table>
 <div id="media-items">
-<?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
-<?php echo get_media_items( $post_id, $errors ); ?>
+	<?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
+	<?php echo get_media_items( $post_id, $errors ); ?>
 </div>
 
 <p class="ml-submit">
-<?php
-submit_button(
-	__( 'Save all changes' ), 'savebutton', 'save', false, array(
-		'id'    => 'save-all',
-		'style' => 'display: none;',
-	)
-);
-?>
+	<?php
+	submit_button(
+		__( 'Save all changes' ),
+		'savebutton',
+		'save',
+		false,
+		array(
+			'id'    => 'save-all',
+			'style' => 'display: none;',
+		)
+	);
+	?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
 <input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
@@ -2488,7 +2501,7 @@ submit_button(
 </p>
 </div>
 </form>
-<?php
+	<?php
 }
 
 /**
@@ -2534,7 +2547,7 @@ function media_upload_library_form( $errors ) {
 
 	list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query( $q );
 
-?>
+	?>
 
 <form id="filter" method="get">
 <input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
@@ -2550,127 +2563,127 @@ function media_upload_library_form( $errors ) {
 </p>
 
 <ul class="subsubsub">
-<?php
-$type_links = array();
-$_num_posts = (array) wp_count_attachments();
-$matches    = wp_match_mime_types( array_keys( $post_mime_types ), array_keys( $_num_posts ) );
-foreach ( $matches as $_type => $reals ) {
-	foreach ( $reals as $real ) {
-		if ( isset( $num_posts[ $_type ] ) ) {
-			$num_posts[ $_type ] += $_num_posts[ $real ];
-		} else {
-			$num_posts[ $_type ] = $_num_posts[ $real ];
+	<?php
+	$type_links = array();
+	$_num_posts = (array) wp_count_attachments();
+	$matches    = wp_match_mime_types( array_keys( $post_mime_types ), array_keys( $_num_posts ) );
+	foreach ( $matches as $_type => $reals ) {
+		foreach ( $reals as $real ) {
+			if ( isset( $num_posts[ $_type ] ) ) {
+				$num_posts[ $_type ] += $_num_posts[ $real ];
+			} else {
+				$num_posts[ $_type ] = $_num_posts[ $real ];
+			}
 		}
 	}
-}
-// If available type specified by media button clicked, filter by that type
-if ( empty( $_GET['post_mime_type'] ) && ! empty( $num_posts[ $type ] ) ) {
-	$_GET['post_mime_type']                        = $type;
-	list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
-}
-if ( empty( $_GET['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
-	$class = ' class="current"';
-} else {
-	$class = '';
-}
-$type_links[] = '<li><a href="' . esc_url(
-	add_query_arg(
-		array(
-			'post_mime_type' => 'all',
-			'paged'          => false,
-			'm'              => false,
-		)
-	)
-) . '"' . $class . '>' . __( 'All Types' ) . '</a>';
-foreach ( $post_mime_types as $mime_type => $label ) {
-	$class = '';
-
-	if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
-		continue;
+	// If available type specified by media button clicked, filter by that type
+	if ( empty( $_GET['post_mime_type'] ) && ! empty( $num_posts[ $type ] ) ) {
+		$_GET['post_mime_type']                        = $type;
+		list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
 	}
-
-	if ( isset( $_GET['post_mime_type'] ) && wp_match_mime_types( $mime_type, $_GET['post_mime_type'] ) ) {
+	if ( empty( $_GET['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
 		$class = ' class="current"';
+	} else {
+		$class = '';
 	}
-
 	$type_links[] = '<li><a href="' . esc_url(
 		add_query_arg(
 			array(
-				'post_mime_type' => $mime_type,
+				'post_mime_type' => 'all',
 				'paged'          => false,
+				'm'              => false,
 			)
 		)
-	) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[ $mime_type ] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[ $mime_type ] ) . '</span>' ) . '</a>';
-}
-/**
- * Filters the media upload mime type list items.
- *
- * Returned values should begin with an `<li>` tag.
- *
- * @since 3.1.0
- *
- * @param string[] $type_links An array of list items containing mime type link HTML.
- */
-echo implode( ' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
-unset( $type_links );
-?>
+	) . '"' . $class . '>' . __( 'All Types' ) . '</a>';
+	foreach ( $post_mime_types as $mime_type => $label ) {
+		$class = '';
+
+		if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
+			continue;
+		}
+
+		if ( isset( $_GET['post_mime_type'] ) && wp_match_mime_types( $mime_type, $_GET['post_mime_type'] ) ) {
+			$class = ' class="current"';
+		}
+
+		$type_links[] = '<li><a href="' . esc_url(
+			add_query_arg(
+				array(
+					'post_mime_type' => $mime_type,
+					'paged'          => false,
+				)
+			)
+		) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[ $mime_type ] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[ $mime_type ] ) . '</span>' ) . '</a>';
+	}
+	/**
+	 * Filters the media upload mime type list items.
+	 *
+	 * Returned values should begin with an `<li>` tag.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param string[] $type_links An array of list items containing mime type link HTML.
+	 */
+	echo implode( ' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
+	unset( $type_links );
+	?>
 </ul>
 
 <div class="tablenav">
 
-<?php
-$page_links = paginate_links(
-	array(
-		'base'      => add_query_arg( 'paged', '%#%' ),
-		'format'    => '',
-		'prev_text' => __( '&laquo;' ),
-		'next_text' => __( '&raquo;' ),
-		'total'     => ceil( $wp_query->found_posts / 10 ),
-		'current'   => $q['paged'],
-	)
-);
+	<?php
+	$page_links = paginate_links(
+		array(
+			'base'      => add_query_arg( 'paged', '%#%' ),
+			'format'    => '',
+			'prev_text' => __( '&laquo;' ),
+			'next_text' => __( '&raquo;' ),
+			'total'     => ceil( $wp_query->found_posts / 10 ),
+			'current'   => $q['paged'],
+		)
+	);
 
-if ( $page_links ) {
-	echo "<div class='tablenav-pages'>$page_links</div>";
-}
-?>
+	if ( $page_links ) {
+		echo "<div class='tablenav-pages'>$page_links</div>";
+	}
+	?>
 
 <div class="alignleft actions">
-<?php
+	<?php
 
-$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
+	$arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
 
-$arc_result = $wpdb->get_results( $arc_query );
+	$arc_result = $wpdb->get_results( $arc_query );
 
-$month_count    = count( $arc_result );
-$selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
+	$month_count    = count( $arc_result );
+	$selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
 
-if ( $month_count && ! ( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
-?>
+	if ( $month_count && ! ( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) {
+		?>
 <select name='m'>
 <option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
-<?php
-foreach ( $arc_result as $arc_row ) {
-	if ( $arc_row->yyear == 0 ) {
-		continue;
-	}
-	$arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
+		<?php
+		foreach ( $arc_result as $arc_row ) {
+			if ( $arc_row->yyear == 0 ) {
+				continue;
+			}
+			$arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
 
-	if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
-		$default = ' selected="selected"';
-	} else {
-		$default = '';
-	}
+			if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
+				$default = ' selected="selected"';
+			} else {
+				$default = '';
+			}
 
-	echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
-	echo esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
-	echo "</option>\n";
-}
-?>
+			echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
+			echo esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
+			echo "</option>\n";
+		}
+		?>
 </select>
-<?php } ?>
+	<?php } ?>
 
-<?php submit_button( __( 'Filter &#187;' ), '', 'post-query-submit', false ); ?>
+	<?php submit_button( __( 'Filter &#187;' ), '', 'post-query-submit', false ); ?>
 
 </div>
 
@@ -2680,8 +2693,8 @@ foreach ( $arc_result as $arc_row ) {
 
 <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">
 
-<?php wp_nonce_field( 'media-form' ); ?>
-<?php //media_upload_form( $errors ); ?>
+	<?php wp_nonce_field( 'media-form' ); ?>
+	<?php //media_upload_form( $errors ); ?>
 
 <script type="text/javascript">
 <!--
@@ -2696,15 +2709,15 @@ jQuery(function($){
 </script>
 
 <div id="media-items">
-<?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
-<?php echo get_media_items( null, $errors ); ?>
+	<?php add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 ); ?>
+	<?php echo get_media_items( null, $errors ); ?>
 </div>
 <p class="ml-submit">
-<?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
+	<?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 </p>
 </form>
-<?php
+	<?php
 }
 
 /**
@@ -2868,15 +2881,15 @@ function media_upload_max_image_resize() {
 		$a   = '<a href="' . esc_url( admin_url( 'options-media.php' ) ) . '" target="_blank">';
 		$end = '</a>';
 	}
-?>
+	?>
 <p class="hide-if-no-js"><label>
 <input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
-<?php
+	<?php
 	/* translators: 1: link start tag, 2: link end tag, 3: width, 4: height */
 	printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d &times; %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
-?>
+	?>
 </label></p>
-<?php
+	<?php
 }
 
 /**
@@ -2925,7 +2938,7 @@ function edit_form_image_editor( $post ) {
 		} else {
 			$not_open_style = ' style="display:none"';
 		}
-	?>
+		?>
 
 		<div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
 
@@ -2937,9 +2950,9 @@ function edit_form_image_editor( $post ) {
 			<?php
 			if ( $open ) {
 				wp_image_editor( $attachment_id );}
-?>
+			?>
 		</div>
-	<?php
+		<?php
 	elseif ( $attachment_id && wp_attachment_is( 'audio', $post ) ) :
 
 		wp_maybe_generate_attachment_metadata( $post );
@@ -3024,7 +3037,7 @@ function edit_form_image_editor( $post ) {
 														if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
 															echo ': ' . __( 'Displayed on attachment pages.' );
 														}
-	?>
+														?>
 	</label>
 	<?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
 
@@ -3055,7 +3068,7 @@ function attachment_submitbox_metadata() {
 	$media_dims = apply_filters( 'media_meta', $media_dims, $post );
 
 	$att_url = wp_get_attachment_url( $post->ID );
-?>
+	?>
 	<div class="misc-pub-section misc-pub-attachment">
 		<label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
 		<input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" id="attachment_url" value="<?php echo esc_attr( $att_url ); ?>" />
@@ -3077,7 +3090,7 @@ function attachment_submitbox_metadata() {
 					} else {
 						echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
 					}
-		?>
+					?>
 		</strong>
 	</div>
 
@@ -3122,7 +3135,7 @@ function attachment_submitbox_metadata() {
 			if ( empty( $meta[ $key ] ) ) {
 				continue;
 			}
-	?>
+			?>
 		<div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
 			<?php echo $label; ?> <strong>
 						<?php
@@ -3137,10 +3150,10 @@ function attachment_submitbox_metadata() {
 								echo esc_html( $meta[ $key ] );
 								break;
 						}
-			?>
+						?>
 			</strong>
 		</div>
-	<?php
+			<?php
 		}
 
 		$fields = array(
@@ -3166,20 +3179,20 @@ function attachment_submitbox_metadata() {
 			if ( empty( $meta['audio'][ $key ] ) ) {
 				continue;
 			}
-	?>
+			?>
 		<div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
 			<?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][ $key ] ); ?></strong>
 		</div>
-	<?php
+			<?php
 		}
 	}
 
 	if ( $media_dims ) :
-	?>
+		?>
 	<div class="misc-pub-section misc-pub-dimensions">
 		<?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
 	</div>
-<?php
+		<?php
 	endif;
 }
 
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 0918274f82..84a36a8acc 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -25,25 +25,25 @@ function post_submit_meta_box( $post, $args = array() ) {
 	$post_type        = $post->post_type;
 	$post_type_object = get_post_type_object( $post_type );
 	$can_publish      = current_user_can( $post_type_object->cap->publish_posts );
-?>
+	?>
 <div class="submitbox" id="submitpost">
 
 <div id="minor-publishing">
 
-<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
+	<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), '', 'save' ); ?>
+	<?php submit_button( __( 'Save' ), '', 'save' ); ?>
 </div>
 
 <div id="minor-publishing-actions">
 <div id="save-action">
-<?php
-if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) {
-	$private_style = '';
-	if ( 'private' == $post->post_status ) {
-		$private_style = 'style="display:none"';
-	}
-?>
+	<?php
+	if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) {
+		$private_style = '';
+		if ( 'private' == $post->post_status ) {
+			$private_style = 'style="display:none"';
+		}
+		?>
 <input <?php echo $private_style; ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e( 'Save Draft' ); ?>" class="button" />
 <span class="spinner"></span>
 <?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
@@ -51,44 +51,44 @@ if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pendi
 <span class="spinner"></span>
 <?php } ?>
 </div>
-<?php if ( is_post_type_viewable( $post_type_object ) ) : ?>
+	<?php if ( is_post_type_viewable( $post_type_object ) ) : ?>
 <div id="preview-action">
-<?php
-$preview_link = esc_url( get_preview_post_link( $post ) );
-if ( 'publish' == $post->post_status ) {
-	$preview_button_text = __( 'Preview Changes' );
-} else {
-	$preview_button_text = __( 'Preview' );
-}
+		<?php
+		$preview_link = esc_url( get_preview_post_link( $post ) );
+		if ( 'publish' == $post->post_status ) {
+			$preview_button_text = __( 'Preview Changes' );
+		} else {
+			$preview_button_text = __( 'Preview' );
+		}
 
-$preview_button = sprintf(
-	'%1$s<span class="screen-reader-text"> %2$s</span>',
-	$preview_button_text,
-	/* translators: accessibility text */
-	__( '(opens in a new tab)' )
-);
-?>
+		$preview_button = sprintf(
+			'%1$s<span class="screen-reader-text"> %2$s</span>',
+			$preview_button_text,
+			/* translators: accessibility text */
+			__( '(opens in a new tab)' )
+		);
+		?>
 <a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview-<?php echo (int) $post->ID; ?>" id="post-preview"><?php echo $preview_button; ?></a>
 <input type="hidden" name="wp-preview" id="wp-preview" value="" />
 </div>
 <?php endif; // public post type ?>
-<?php
-/**
- * Fires before the post time/date setting in the Publish meta box.
- *
- * @since 4.4.0
- *
- * @param WP_Post $post WP_Post object for the current post.
- */
-do_action( 'post_submitbox_minor_actions', $post );
-?>
+	<?php
+	/**
+	 * Fires before the post time/date setting in the Publish meta box.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param WP_Post $post WP_Post object for the current post.
+	 */
+	do_action( 'post_submitbox_minor_actions', $post );
+	?>
 <div class="clear"></div>
 </div><!-- #minor-publishing-actions -->
 
 <div id="misc-publishing-actions">
 
 <div class="misc-pub-section misc-pub-post-status">
-<?php _e( 'Status:' ); ?> <span id="post-status-display">
+	<?php _e( 'Status:' ); ?> <span id="post-status-display">
 			<?php
 
 			switch ( $post->post_status ) {
@@ -109,22 +109,22 @@ do_action( 'post_submitbox_minor_actions', $post );
 					_e( 'Draft' );
 					break;
 			}
-?>
+			?>
 </span>
-<?php
-if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) {
-	$private_style = '';
-	if ( 'private' == $post->post_status ) {
-		$private_style = 'style="display:none"';
-	}
-?>
+	<?php
+	if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) {
+		$private_style = '';
+		if ( 'private' == $post->post_status ) {
+			$private_style = 'style="display:none"';
+		}
+		?>
 <a href="#post_status" <?php echo $private_style; ?> class="edit-post-status hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ); ?></span></a>
 
 <div id="post-status-select" class="hide-if-js">
 <input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ( 'auto-draft' == $post->post_status ) ? 'draft' : $post->post_status ); ?>" />
 <label for="post_status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
 <select name="post_status" id="post_status">
-<?php if ( 'publish' == $post->post_status ) : ?>
+		<?php if ( 'publish' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e( 'Published' ); ?></option>
 <?php elseif ( 'private' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e( 'Privately Published' ); ?></option>
@@ -132,7 +132,7 @@ if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_
 <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e( 'Scheduled' ); ?></option>
 <?php endif; ?>
 <option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e( 'Pending Review' ); ?></option>
-<?php if ( 'auto-draft' == $post->post_status ) : ?>
+		<?php if ( 'auto-draft' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
 <?php else : ?>
 <option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
@@ -146,7 +146,7 @@ if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_
 </div><!-- .misc-pub-section -->
 
 <div class="misc-pub-section misc-pub-visibility" id="visibility">
-<?php _e( 'Visibility:' ); ?> <span id="post-visibility-display">
+	<?php _e( 'Visibility:' ); ?> <span id="post-visibility-display">
 							<?php
 
 							if ( 'private' == $post->post_status ) {
@@ -165,19 +165,19 @@ if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_
 							}
 
 							echo esc_html( $visibility_trans );
-?>
+							?>
 </span>
-<?php if ( $can_publish ) { ?>
+	<?php if ( $can_publish ) { ?>
 <a href="#visibility" class="edit-visibility hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit visibility' ); ?></span></a>
 
 <div id="post-visibility-select" class="hide-if-js">
 <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr( $post->post_password ); ?>" />
-<?php if ( $post_type == 'post' ) : ?>
+		<?php if ( $post_type == 'post' ) : ?>
 <input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> />
 <?php endif; ?>
 <input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
 <input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e( 'Public' ); ?></label><br />
-<?php if ( $post_type == 'post' && current_user_can( 'edit_others_posts' ) ) : ?>
+		<?php if ( $post_type == 'post' && current_user_can( 'edit_others_posts' ) ) : ?>
 <span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> /> <label for="sticky" class="selectit"><?php _e( 'Stick this post to the front page' ); ?></label><br /></span>
 <?php endif; ?>
 <input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e( 'Password protected' ); ?></label><br />
@@ -193,57 +193,57 @@ if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_
 
 </div><!-- .misc-pub-section -->
 
-<?php
-/* translators: Publish box date format, see https://secure.php.net/date */
-$datef = __( 'M j, Y @ H:i' );
-if ( 0 != $post->ID ) {
-	if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
-		/* translators: Post date information. %s: Date on which the post is currently scheduled to be published */
-		$stamp = __( 'Scheduled for: <b>%s</b>' );
-	} elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
-		/* translators: Post date information. %s: Date on which the post was published */
-		$stamp = __( 'Published on: <b>%s</b>' );
-	} elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
-		$stamp = __( 'Publish <b>immediately</b>' );
-	} elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
-		/* translators: Post date information. %s: Date on which the post is to be published */
-		$stamp = __( 'Schedule for: <b>%s</b>' );
-	} else { // draft, 1 or more saves, date specified
-		/* translators: Post date information. %s: Date on which the post is to be published */
-		$stamp = __( 'Publish on: <b>%s</b>' );
-	}
-	$date = date_i18n( $datef, strtotime( $post->post_date ) );
-} else { // draft (no saves, and thus no date specified)
-	$stamp = __( 'Publish <b>immediately</b>' );
-	$date  = date_i18n( $datef, strtotime( current_time( 'mysql' ) ) );
-}
-
-if ( ! empty( $args['args']['revisions_count'] ) ) :
-?>
-<div class="misc-pub-section misc-pub-revisions">
 	<?php
+	/* translators: Publish box date format, see https://secure.php.net/date */
+	$datef = __( 'M j, Y @ H:i' );
+	if ( 0 != $post->ID ) {
+		if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
+			/* translators: Post date information. %s: Date on which the post is currently scheduled to be published */
+			$stamp = __( 'Scheduled for: <b>%s</b>' );
+		} elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
+			/* translators: Post date information. %s: Date on which the post was published */
+			$stamp = __( 'Published on: <b>%s</b>' );
+		} elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
+			$stamp = __( 'Publish <b>immediately</b>' );
+		} elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
+			/* translators: Post date information. %s: Date on which the post is to be published */
+			$stamp = __( 'Schedule for: <b>%s</b>' );
+		} else { // draft, 1 or more saves, date specified
+			/* translators: Post date information. %s: Date on which the post is to be published */
+			$stamp = __( 'Publish on: <b>%s</b>' );
+		}
+		$date = date_i18n( $datef, strtotime( $post->post_date ) );
+	} else { // draft (no saves, and thus no date specified)
+		$stamp = __( 'Publish <b>immediately</b>' );
+		$date  = date_i18n( $datef, strtotime( current_time( 'mysql' ) ) );
+	}
+
+	if ( ! empty( $args['args']['revisions_count'] ) ) :
+		?>
+<div class="misc-pub-section misc-pub-revisions">
+		<?php
 		/* translators: Post revisions heading. %s: The number of available revisions */
 		printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' );
-	?>
+		?>
 	<a class="hide-if-no-js" href="<?php echo esc_url( get_edit_post_link( $args['args']['revision_id'] ) ); ?>"><span aria-hidden="true"><?php _ex( 'Browse', 'revisions' ); ?></span> <span class="screen-reader-text"><?php _e( 'Browse revisions' ); ?></span></a>
 </div>
-<?php
+		<?php
 endif;
 
-if ( $can_publish ) : // Contributors don't get to choose the date of publish
-?>
+	if ( $can_publish ) : // Contributors don't get to choose the date of publish
+		?>
 <div class="misc-pub-section curtime misc-pub-curtime">
 	<span id="timestamp">
-	<?php printf( $stamp, $date ); ?></span>
+		<?php printf( $stamp, $date ); ?></span>
 	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
 	<fieldset id="timestampdiv" class="hide-if-js">
 	<legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
-	<?php touch_time( ( $action === 'edit' ), 1 ); ?>
+		<?php touch_time( ( $action === 'edit' ), 1 ); ?>
 	</fieldset>
 </div><?php // /misc-pub-section ?>
 <?php endif; ?>
 
-<?php if ( 'draft' === $post->post_status && get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) : ?>
+	<?php if ( 'draft' === $post->post_status && get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) : ?>
 	<div class="notice notice-info notice-alt inline">
 		<p>
 			<?php
@@ -261,84 +261,84 @@ if ( $can_publish ) : // Contributors don't get to choose the date of publish
 			?>
 		</p>
 	</div>
-<?php endif; ?>
+	<?php endif; ?>
 
-<?php
-/**
- * Fires after the post time/date setting in the Publish meta box.
- *
- * @since 2.9.0
- * @since 4.4.0 Added the `$post` parameter.
- *
- * @param WP_Post $post WP_Post object for the current post.
- */
-do_action( 'post_submitbox_misc_actions', $post );
-?>
+	<?php
+	/**
+	 * Fires after the post time/date setting in the Publish meta box.
+	 *
+	 * @since 2.9.0
+	 * @since 4.4.0 Added the `$post` parameter.
+	 *
+	 * @param WP_Post $post WP_Post object for the current post.
+	 */
+	do_action( 'post_submitbox_misc_actions', $post );
+	?>
 </div>
 <div class="clear"></div>
 </div>
 
 <div id="major-publishing-actions">
-<?php
-/**
- * Fires at the beginning of the publishing actions section of the Publish meta box.
- *
- * @since 2.7.0
- * @since 4.9.0 Added the `$post` parameter.
- *
- * @param WP_Post|null $post WP_Post object for the current post on Edit Post screen,
- *                           null on Edit Link screen.
- */
-do_action( 'post_submitbox_start', $post );
-?>
-<div id="delete-action">
-<?php
-if ( current_user_can( 'delete_post', $post->ID ) ) {
-	if ( ! EMPTY_TRASH_DAYS ) {
-		$delete_text = __( 'Delete Permanently' );
-	} else {
-		$delete_text = __( 'Move to Trash' );
-	}
+	<?php
+	/**
+	 * Fires at the beginning of the publishing actions section of the Publish meta box.
+	 *
+	 * @since 2.7.0
+	 * @since 4.9.0 Added the `$post` parameter.
+	 *
+	 * @param WP_Post|null $post WP_Post object for the current post on Edit Post screen,
+	 *                           null on Edit Link screen.
+	 */
+	do_action( 'post_submitbox_start', $post );
 	?>
+<div id="delete-action">
+	<?php
+	if ( current_user_can( 'delete_post', $post->ID ) ) {
+		if ( ! EMPTY_TRASH_DAYS ) {
+			$delete_text = __( 'Delete Permanently' );
+		} else {
+			$delete_text = __( 'Move to Trash' );
+		}
+		?>
 <a class="submitdelete deletion" href="<?php echo get_delete_post_link( $post->ID ); ?>"><?php echo $delete_text; ?></a>
 													<?php
-}
-?>
+	}
+	?>
 </div>
 
 <div id="publishing-action">
 <span class="spinner"></span>
-<?php
-if ( ! in_array( $post->post_status, array( 'publish', 'future', 'private' ) ) || 0 == $post->ID ) {
-	if ( $can_publish ) :
-		if ( ! empty( $post->post_date_gmt ) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) :
-		?>
+	<?php
+	if ( ! in_array( $post->post_status, array( 'publish', 'future', 'private' ) ) || 0 == $post->ID ) {
+		if ( $can_publish ) :
+			if ( ! empty( $post->post_date_gmt ) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) :
+				?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php echo esc_attr_x( 'Schedule', 'post action/button label' ); ?>" />
-		<?php submit_button( _x( 'Schedule', 'post action/button label' ), 'primary large', 'publish', false ); ?>
-<?php	else : ?>
+				<?php submit_button( _x( 'Schedule', 'post action/button label' ), 'primary large', 'publish', false ); ?>
+	<?php	else : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Publish' ); ?>" />
 		<?php submit_button( __( 'Publish' ), 'primary large', 'publish', false ); ?>
-<?php
-endif;
+	<?php
+	endif;
 	else :
-	?>
+		?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Submit for Review' ); ?>" />
 		<?php submit_button( __( 'Submit for Review' ), 'primary large', 'publish', false ); ?>
-<?php
-	endif;
-} else {
-?>
+		<?php
+		endif;
+	} else {
+		?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Update' ); ?>" />
 		<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update' ); ?>" />
-<?php
-}
-?>
+		<?php
+	}
+	?>
 </div>
 <div class="clear"></div>
 </div>
 </div>
 
-<?php
+	<?php
 }
 
 /**
@@ -349,14 +349,14 @@ endif;
  * @param object $post
  */
 function attachment_submit_meta_box( $post ) {
-?>
+	?>
 <div class="submitbox" id="submitpost">
 
 <div id="minor-publishing">
 
-<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
+	<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), '', 'save' ); ?>
+	<?php submit_button( __( 'Save' ), '', 'save' ); ?>
 </div>
 
 
@@ -418,7 +418,7 @@ function attachment_submit_meta_box( $post ) {
 
 </div>
 
-<?php
+	<?php
 }
 
 /**
@@ -449,7 +449,7 @@ function post_format_meta_box( $post, $box ) {
 			if ( $post_format && ! in_array( $post_format, $post_formats[0] ) ) {
 				$post_formats[0][] = $post_format;
 			}
-		?>
+			?>
 		<div id="post-formats-select">
 		<fieldset>
 			<legend class="screen-reader-text"><?php _e( 'Post Formats' ); ?></legend>
@@ -459,7 +459,7 @@ function post_format_meta_box( $post, $box ) {
 			<?php endforeach; ?>
 		</fieldset>
 	</div>
-	<?php
+			<?php
 	endif;
 endif;
 }
@@ -501,7 +501,7 @@ function post_tags_meta_box( $post, $box ) {
 	if ( ! is_string( $terms_to_edit ) ) {
 		$terms_to_edit = '';
 	}
-?>
+	?>
 <div class="tagsdiv" id="<?php echo $tax_name; ?>">
 	<div class="jaxtag">
 	<div class="nojs-tags hide-if-js">
@@ -521,10 +521,10 @@ function post_tags_meta_box( $post, $box ) {
 	</div>
 	<ul class="tagchecklist" role="list"></ul>
 </div>
-<?php if ( $user_can_assign_terms ) : ?>
+	<?php if ( $user_can_assign_terms ) : ?>
 <p class="hide-if-no-js"><button type="button" class="button-link tagcloud-link" id="link-<?php echo $tax_name; ?>" aria-expanded="false"><?php echo $taxonomy->labels->choose_from_most_used; ?></button></p>
 <?php endif; ?>
-<?php
+	<?php
 }
 
 /**
@@ -579,12 +579,13 @@ function post_categories_meta_box( $post, $box ) {
 			<ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
 				<?php
 				wp_terms_checklist(
-					$post->ID, array(
+					$post->ID,
+					array(
 						'taxonomy'     => $tax_name,
 						'popular_cats' => $popular_ids,
 					)
 				);
-?>
+				?>
 			</ul>
 		</div>
 	<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
@@ -657,18 +658,18 @@ function post_categories_meta_box( $post, $box ) {
  * @param object $post
  */
 function post_excerpt_meta_box( $post ) {
-?>
+	?>
 <label class="screen-reader-text" for="excerpt"><?php _e( 'Excerpt' ); ?></label><textarea rows="1" cols="40" name="excerpt" id="excerpt"><?php echo $post->post_excerpt; // textarea_escaped ?></textarea>
 <p>
-<?php
+	<?php
 	printf(
 		/* translators: %s: Codex URL */
 		__( 'Excerpts are optional hand-crafted summaries of your content that can be used in your theme. <a href="%s">Learn more about manual excerpts</a>.' ),
 		__( 'https://codex.wordpress.org/Excerpt' )
 	);
-?>
+	?>
 </p>
-<?php
+	<?php
 }
 
 /**
@@ -690,25 +691,25 @@ function post_trackback_meta_box( $post ) {
 		$pings .= '</ul>';
 	}
 
-?>
+	?>
 <p>
 	<label for="trackback_url"><?php _e( 'Send trackbacks to:' ); ?></label>
 	<?php echo $form_trackback; ?>
 </p>
 <p id="trackback-url-desc" class="howto"><?php _e( 'Separate multiple URLs with spaces' ); ?></p>
 <p>
-<?php
+	<?php
 	printf(
 		/* translators: %s: Codex URL */
 		__( 'Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites, they&#8217;ll be notified automatically using <a href="%s">pingbacks</a>, no other action necessary.' ),
 		__( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' )
 	);
-?>
+	?>
 </p>
-<?php
-if ( ! empty( $pings ) ) {
-	echo $pings;
-}
+	<?php
+	if ( ! empty( $pings ) ) {
+		echo $pings;
+	}
 }
 
 /**
@@ -719,30 +720,30 @@ if ( ! empty( $pings ) ) {
  * @param object $post
  */
 function post_custom_meta_box( $post ) {
-?>
+	?>
 <div id="postcustomstuff">
 <div id="ajax-response"></div>
-<?php
-$metadata = has_meta( $post->ID );
-foreach ( $metadata as $key => $value ) {
-	if ( is_protected_meta( $metadata[ $key ]['meta_key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ]['meta_key'] ) ) {
-		unset( $metadata[ $key ] );
+	<?php
+	$metadata = has_meta( $post->ID );
+	foreach ( $metadata as $key => $value ) {
+		if ( is_protected_meta( $metadata[ $key ]['meta_key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ]['meta_key'] ) ) {
+			unset( $metadata[ $key ] );
+		}
 	}
-}
-list_meta( $metadata );
-meta_form( $post );
-?>
+	list_meta( $metadata );
+	meta_form( $post );
+	?>
 </div>
 <p>
-<?php
+	<?php
 	printf(
 		/* translators: %s: Codex URL */
 		__( 'Custom fields can be used to add extra metadata to a post that you can <a href="%s">use in your theme</a>.' ),
 		__( 'https://codex.wordpress.org/Using_Custom_Fields' )
 	);
-?>
+	?>
 </p>
-<?php
+	<?php
 }
 
 /**
@@ -753,7 +754,7 @@ meta_form( $post );
  * @param object $post
  */
 function post_comment_status_meta_box( $post ) {
-?>
+	?>
 <input name="advanced_view" type="hidden" value="1" />
 <p class="meta-options">
 	<label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked( $post->comment_status, 'open' ); ?> /> <?php _e( 'Allow comments' ); ?></label><br />
@@ -777,7 +778,7 @@ function post_comment_status_meta_box( $post ) {
 	do_action( 'post_comment_status_meta_box-options', $post );
 	?>
 </p>
-<?php
+	<?php
 }
 
 /**
@@ -844,9 +845,9 @@ function post_comment_meta_box( $post ) {
 function post_slug_meta_box( $post ) {
 	/** This filter is documented in wp-admin/edit-tag-form.php */
 	$editable_slug = apply_filters( 'editable_slug', $post->post_name, $post );
-?>
+	?>
 <label class="screen-reader-text" for="post_name"><?php _e( 'Slug' ); ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr( $editable_slug ); ?>" />
-<?php
+	<?php
 }
 
 /**
@@ -860,9 +861,9 @@ function post_slug_meta_box( $post ) {
  */
 function post_author_meta_box( $post ) {
 	global $user_ID;
-?>
+	?>
 <label class="screen-reader-text" for="post_author_override"><?php _e( 'Author' ); ?></label>
-<?php
+	<?php
 	wp_dropdown_users(
 		array(
 			'who'              => 'authors',
@@ -919,10 +920,10 @@ function page_attributes_meta_box( $post ) {
 		$dropdown_args = apply_filters( 'page_attributes_dropdown_pages_args', $dropdown_args, $post );
 		$pages         = wp_dropdown_pages( $dropdown_args );
 		if ( ! empty( $pages ) ) :
-?>
+			?>
 <p class="post-attributes-label-wrapper"><label class="post-attributes-label" for="parent_id"><?php _e( 'Parent' ); ?></label></p>
-<?php echo $pages; ?>
-<?php
+			<?php echo $pages; ?>
+			<?php
 		endif; // end empty pages check
 	endif;  // end hierarchical check.
 
@@ -930,53 +931,53 @@ function page_attributes_meta_box( $post ) {
 		$template = ! empty( $post->page_template ) ? $post->page_template : false;
 		?>
 <p class="post-attributes-label-wrapper"><label class="post-attributes-label" for="page_template"><?php _e( 'Template' ); ?></label>
-<?php
-/**
- * Fires immediately after the label inside the 'Template' section
- * of the 'Page Attributes' meta box.
- *
- * @since 4.4.0
- *
- * @param string  $template The template used for the current post.
- * @param WP_Post $post     The current post.
- */
-do_action( 'page_attributes_meta_box_template', $template, $post );
-?>
+		<?php
+		/**
+		 * Fires immediately after the label inside the 'Template' section
+		 * of the 'Page Attributes' meta box.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param string  $template The template used for the current post.
+		 * @param WP_Post $post     The current post.
+		 */
+		do_action( 'page_attributes_meta_box_template', $template, $post );
+		?>
 </p>
 <select name="page_template" id="page_template">
-<?php
-/**
- * Filters the title of the default page template displayed in the drop-down.
- *
- * @since 4.1.0
- *
- * @param string $label   The display value for the default page template title.
- * @param string $context Where the option label is displayed. Possible values
- *                        include 'meta-box' or 'quick-edit'.
- */
-$default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'meta-box' );
-?>
+		<?php
+		/**
+		 * Filters the title of the default page template displayed in the drop-down.
+		 *
+		 * @since 4.1.0
+		 *
+		 * @param string $label   The display value for the default page template title.
+		 * @param string $context Where the option label is displayed. Possible values
+		 *                        include 'meta-box' or 'quick-edit'.
+		 */
+		$default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'meta-box' );
+		?>
 <option value="default"><?php echo esc_html( $default_title ); ?></option>
-<?php page_template_dropdown( $template, $post->post_type ); ?>
+		<?php page_template_dropdown( $template, $post->post_type ); ?>
 </select>
 <?php endif; ?>
-<?php if ( post_type_supports( $post->post_type, 'page-attributes' ) ) : ?>
+	<?php if ( post_type_supports( $post->post_type, 'page-attributes' ) ) : ?>
 <p class="post-attributes-label-wrapper"><label class="post-attributes-label" for="menu_order"><?php _e( 'Order' ); ?></label></p>
 <input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo esc_attr( $post->menu_order ); ?>" />
-<?php
-/**
- * Fires before the help hint text in the 'Page Attributes' meta box.
- *
- * @since 4.9.0
- *
- * @param WP_Post $post The current post.
- */
-do_action( 'page_attributes_misc_attributes', $post );
-?>
-<?php if ( 'page' == $post->post_type && get_current_screen()->get_help_tabs() ) : ?>
+		<?php
+		/**
+		 * Fires before the help hint text in the 'Page Attributes' meta box.
+		 *
+		 * @since 4.9.0
+		 *
+		 * @param WP_Post $post The current post.
+		 */
+		do_action( 'page_attributes_misc_attributes', $post );
+		?>
+		<?php if ( 'page' == $post->post_type && get_current_screen()->get_help_tabs() ) : ?>
 <p><?php _e( 'Need help? Use the Help tab above the screen title.' ); ?></p>
-<?php
-endif;
+			<?php
+	endif;
 	endif;
 }
 
@@ -990,19 +991,19 @@ endif;
  * @param object $link
  */
 function link_submit_meta_box( $link ) {
-?>
+	?>
 <div class="submitbox" id="submitlink">
 
 <div id="minor-publishing">
 
-<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
+	<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), '', 'save', false ); ?>
+	<?php submit_button( __( 'Save' ), '', 'save', false ); ?>
 </div>
 
 <div id="minor-publishing-actions">
 <div id="preview-action">
-<?php if ( ! empty( $link->link_id ) ) { ?>
+	<?php if ( ! empty( $link->link_id ) ) { ?>
 	<a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e( 'Visit Link' ); ?></a>
 <?php } ?>
 </div>
@@ -1018,20 +1019,20 @@ function link_submit_meta_box( $link ) {
 </div>
 
 <div id="major-publishing-actions">
-<?php
-/** This action is documented in wp-admin/includes/meta-boxes.php */
-do_action( 'post_submitbox_start', null );
-?>
+	<?php
+	/** This action is documented in wp-admin/includes/meta-boxes.php */
+	do_action( 'post_submitbox_start', null );
+	?>
 <div id="delete-action">
-<?php
-if ( ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && current_user_can( 'manage_links' ) ) {
-?>
+	<?php
+	if ( ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && current_user_can( 'manage_links' ) ) {
+		?>
 	<a class="submitdelete deletion" href="<?php echo wp_nonce_url( "link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ); ?>" onclick="if ( confirm('<?php echo esc_js( sprintf( __( "You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ); ?>') ) {return true;}return false;"><?php _e( 'Delete' ); ?></a>
 <?php } ?>
 </div>
 
 <div id="publishing-action">
-<?php if ( ! empty( $link->link_id ) ) { ?>
+	<?php if ( ! empty( $link->link_id ) ) { ?>
 	<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update Link' ); ?>" />
 <?php } else { ?>
 	<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Add Link' ); ?>" />
@@ -1039,17 +1040,17 @@ if ( ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && current_user_can
 </div>
 <div class="clear"></div>
 </div>
-<?php
-/**
- * Fires at the end of the Publish box in the Link editing screen.
- *
- * @since 2.5.0
- */
-do_action( 'submitlink_box' );
-?>
+	<?php
+	/**
+	 * Fires at the end of the Publish box in the Link editing screen.
+	 *
+	 * @since 2.5.0
+	 */
+	do_action( 'submitlink_box' );
+	?>
 <div class="clear"></div>
 </div>
-<?php
+	<?php
 }
 
 /**
@@ -1060,7 +1061,7 @@ do_action( 'submitlink_box' );
  * @param object $link
  */
 function link_categories_meta_box( $link ) {
-?>
+	?>
 <div id="taxonomy-linkcategory" class="categorydiv">
 	<ul id="category-tabs" class="category-tabs">
 		<li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
@@ -1096,7 +1097,7 @@ function link_categories_meta_box( $link ) {
 		</p>
 	</div>
 </div>
-<?php
+	<?php
 }
 
 /**
@@ -1108,20 +1109,20 @@ function link_categories_meta_box( $link ) {
  */
 function link_target_meta_box( $link ) {
 
-?>
+	?>
 <fieldset><legend class="screen-reader-text"><span><?php _e( 'Target' ); ?></span></legend>
 <p><label for="link_target_blank" class="selectit">
 <input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ( $link->link_target == '_blank' ) ? 'checked="checked"' : '' ); ?> />
-<?php _e( '<code>_blank</code> &mdash; new window or tab.' ); ?></label></p>
+	<?php _e( '<code>_blank</code> &mdash; new window or tab.' ); ?></label></p>
 <p><label for="link_target_top" class="selectit">
 <input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ( $link->link_target == '_top' ) ? 'checked="checked"' : '' ); ?> />
-<?php _e( '<code>_top</code> &mdash; current window or tab, with no frames.' ); ?></label></p>
+	<?php _e( '<code>_top</code> &mdash; current window or tab, with no frames.' ); ?></label></p>
 <p><label for="link_target_none" class="selectit">
 <input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ( $link->link_target == '' ) ? 'checked="checked"' : '' ); ?> />
-<?php _e( '<code>_none</code> &mdash; same window or tab.' ); ?></label></p>
+	<?php _e( '<code>_none</code> &mdash; same window or tab.' ); ?></label></p>
 </fieldset>
 <p><?php _e( 'Choose the target frame for your link.' ); ?></p>
-<?php
+	<?php
 }
 
 /**
@@ -1173,7 +1174,7 @@ function xfn_check( $class, $value = '', $deprecated = '' ) {
  * @param object $link
  */
 function link_xfn_meta_box( $link ) {
-?>
+	?>
 <table class="links-table">
 	<tr>
 		<th scope="row"><label for="link_rel"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'rel:' ); ?></label></th>
@@ -1280,7 +1281,7 @@ function link_xfn_meta_box( $link ) {
 
 </table>
 <p><?php _e( 'If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.' ); ?></p>
-<?php
+	<?php
 }
 
 /**
@@ -1291,7 +1292,7 @@ function link_xfn_meta_box( $link ) {
  * @param object $link
  */
 function link_advanced_meta_box( $link ) {
-?>
+	?>
 <table class="links-table" cellpadding="0">
 	<tr>
 		<th scope="row"><label for="link_image"><?php _e( 'Image Address' ); ?></label></th>
@@ -1321,7 +1322,7 @@ function link_advanced_meta_box( $link ) {
 		</td>
 	</tr>
 </table>
-<?php
+	<?php
 }
 
 /**
@@ -1354,11 +1355,11 @@ function attachment_id3_data_meta_box( $post ) {
 		if ( ! empty( $meta[ $key ] ) ) {
 			$value = $meta[ $key ];
 		}
-	?>
+		?>
 	<p>
 		<label for="title"><?php echo $label; ?></label><br />
 		<input type="text" name="id3_<?php echo esc_attr( $key ); ?>" id="id3_<?php echo esc_attr( $key ); ?>" class="large-text" value="<?php echo esc_attr( $value ); ?>" />
 	</p>
-	<?php
+		<?php
 	endforeach;
 }
diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index e8d92b7d05..1c575f8e25 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -165,7 +165,8 @@ function insert_with_markers( $filename, $marker, $insertion ) {
 
 	// Generate the new file data
 	$new_file_data = implode(
-		"\n", array_merge(
+		"\n",
+		array_merge(
 			$pre_lines,
 			array( $start_marker ),
 			$insertion,
@@ -855,7 +856,8 @@ function admin_color_scheme_picker( $user_id ) {
 				array(
 					'fresh' => '',
 					'light' => '',
-				), $_wp_admin_css_colors
+				),
+				$_wp_admin_css_colors
 			)
 		);
 	}
@@ -897,7 +899,7 @@ function admin_color_scheme_picker( $user_id ) {
 
 		endforeach;
 
-	?>
+		?>
 	</fieldset>
 	<?php
 }
@@ -1147,7 +1149,7 @@ function wp_admin_canonical_url() {
 			window.history.replaceState( null, null, document.getElementById( 'wp-admin-canonical' ).href + window.location.hash );
 		}
 	</script>
-<?php
+	<?php
 }
 
 /**
@@ -1428,13 +1430,15 @@ final class WP_Privacy_Policy_Content {
 
 		?>
 		<div class="policy-text-updated notice notice-warning">
-			<p><?php
+			<p>
+			<?php
 				printf(
 					/* translators: %s: Privacy Policy Guide URL */
 					__( 'The suggested privacy policy text has changed. Please <a href="%s">review the guide</a> and update your privacy policy.' ),
 					esc_url( admin_url( 'tools.php?wp-privacy-policy-guide=1' ) )
 				);
-			?></p>
+			?>
+			</p>
 		</div>
 		<?php
 	}
@@ -1453,8 +1457,8 @@ final class WP_Privacy_Policy_Content {
 		}
 
 		// Remove updated|removed status.
-		$old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
-		$done = array();
+		$old          = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
+		$done         = array();
 		$update_cache = false;
 
 		foreach ( $old as $old_key => $old_data ) {
@@ -1466,7 +1470,7 @@ final class WP_Privacy_Policy_Content {
 
 			if ( ! empty( $old_data['updated'] ) ) {
 				// 'updated' is now 'added'.
-				$done[] = array(
+				$done[]       = array(
 					'plugin_name' => $old_data['plugin_name'],
 					'policy_text' => $old_data['policy_text'],
 					'added'       => $old_data['updated'],
@@ -1497,11 +1501,11 @@ final class WP_Privacy_Policy_Content {
 	 */
 	public static function get_suggested_policy_text() {
 		$policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
-		$checked = array();
-		$time = time();
-		$update_cache = false;
-		$new = self::$policy_content;
-		$old = array();
+		$checked        = array();
+		$time           = time();
+		$update_cache   = false;
+		$new            = self::$policy_content;
+		$old            = array();
 
 		if ( $policy_page_id ) {
 			$old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
@@ -1516,18 +1520,18 @@ final class WP_Privacy_Policy_Content {
 					// Use the new plugin name in case it was changed, translated, etc.
 					if ( $old_data['plugin_name'] !== $new_data['plugin_name'] ) {
 						$old_data['plugin_name'] = $new_data['plugin_name'];
-						$update_cache = true;
+						$update_cache            = true;
 					}
 
 					// A plugin was re-activated.
 					if ( ! empty( $old_data['removed'] ) ) {
 						unset( $old_data['removed'] );
 						$old_data['added'] = $time;
-						$update_cache = true;
+						$update_cache      = true;
 					}
 
 					$checked[] = $old_data;
-					$found = true;
+					$found     = true;
 				} elseif ( $new_data['plugin_name'] === $old_data['plugin_name'] ) {
 					// The info for the policy was updated.
 					$checked[] = array(
@@ -1535,7 +1539,7 @@ final class WP_Privacy_Policy_Content {
 						'policy_text' => $new_data['policy_text'],
 						'updated'     => $time,
 					);
-					$found = $update_cache = true;
+					$found     = $update_cache = true;
 				}
 
 				if ( $found ) {
@@ -1636,10 +1640,10 @@ final class WP_Privacy_Policy_Content {
 
 		$content_array = self::get_suggested_policy_text();
 
-		$content = '';
-		$toc = array( '<li><a href="#wp-privacy-policy-guide-introduction">' . __( 'Introduction' ) . '</a></li>' );
-		$date_format = __( 'F j, Y' );
-		$copy = __( 'Copy' );
+		$content       = '';
+		$toc           = array( '<li><a href="#wp-privacy-policy-guide-introduction">' . __( 'Introduction' ) . '</a></li>' );
+		$date_format   = __( 'F j, Y' );
+		$copy          = __( 'Copy' );
 		$return_to_top = '<a href="#" class="return-to-top">' . __( '&uarr; Return to Top' ) . '</a>';
 
 		foreach ( $content_array as $section ) {
@@ -1647,14 +1651,14 @@ final class WP_Privacy_Policy_Content {
 
 			if ( ! empty( $section['removed'] ) ) {
 				$class = ' text-removed';
-				$date = date_i18n( $date_format, $section['removed'] );
+				$date  = date_i18n( $date_format, $section['removed'] );
 				$meta  = sprintf( __( 'Removed %s.' ), $date );
 
 				$removed = __( 'You deactivated this plugin on %s and may no longer need this policy.' );
 				$removed = '<div class="error inline"><p>' . sprintf( $removed, $date ) . '</p></div>';
 			} elseif ( ! empty( $section['updated'] ) ) {
 				$class = ' text-updated';
-				$date = date_i18n( $date_format, $section['updated'] );
+				$date  = date_i18n( $date_format, $section['updated'] );
 				$meta  = sprintf( __( 'Updated %s.' ), $date );
 			}
 
@@ -1663,8 +1667,8 @@ final class WP_Privacy_Policy_Content {
 			}
 
 			$plugin_name = esc_html( $section['plugin_name'] );
-			$toc_id = 'wp-privacy-policy-guide-' . sanitize_title( $plugin_name );
-			$toc[] = sprintf( '<li><a href="#%1$s">%2$s</a>' . $meta . '</li>', $toc_id, $plugin_name );
+			$toc_id      = 'wp-privacy-policy-guide-' . sanitize_title( $plugin_name );
+			$toc[]       = sprintf( '<li><a href="#%1$s">%2$s</a>' . $meta . '</li>', $toc_id, $plugin_name );
 
 			$content .= '<div class="privacy-text-section' . $class . '">';
 			$content .= '<a id="' . $toc_id . '">&nbsp;</a>';
@@ -1676,12 +1680,12 @@ final class WP_Privacy_Policy_Content {
 			$content .= $return_to_top;
 
 			if ( empty( $section['removed'] ) ) {
-				$content .= '<div class="privacy-text-actions">';
-					$content .= '<button type="button" class="privacy-text-copy button">';
+				$content         .= '<div class="privacy-text-actions">';
+					$content     .= '<button type="button" class="privacy-text-copy button">';
 						$content .= $copy;
 						$content .= '<span class="screen-reader-text">' . sprintf( __( 'Copy suggested policy text from %s.' ), $plugin_name ) . '</span>';
-					$content .= '</button>';
-				$content .= '</div>';
+					$content     .= '</button>';
+				$content         .= '</div>';
 			}
 
 			$content .= "</div>\n"; // End of .privacy-text-section.
@@ -1727,17 +1731,17 @@ final class WP_Privacy_Policy_Content {
 	 */
 	public static function get_default_content( $descr = false ) {
 		$suggested_text = $descr ? '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>' : '';
-		$content = '';
+		$content        = '';
 
 		// Start of the suggested privacy policy text.
 		$descr && $content .=
 			'<div class="wp-suggested-text">';
-		$content .=
+		$content           .=
 			'<h2>' . __( 'Who we are' ) . '</h2>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' .
 			'<p class="privacy-policy-tutorial">' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '</p>';
-		$content .=
+		$content           .=
 			/* translators: %s Site URL */
 			'<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>' .
 
@@ -1749,29 +1753,29 @@ final class WP_Privacy_Policy_Content {
 			'<p class="privacy-policy-tutorial">' . __( 'Personal data is not just created by a user&#8217;s interactions with your site. Personal data is also generated from technical processes such as contact forms, comments, cookies, analytics, and third party embeds.' ) . '</p>' .
 			'<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen from registered users. However some of your plugins may collect personal data. You should add the relevant information below.' ) . '</p>';
 
-		$content .=
+		$content           .=
 			'<h3>' . __( 'Comments' ) . '</h3>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information is captured through comments. We have noted the data which WordPress collects by default.' ) . '</p>';
-		$content .=
+		$content           .=
 			'<p>' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor&#8217;s IP address and browser user agent string to help spam detection.' ) . '</p>' .
 			'<p>' . __( 'An anonymized string created from your email address (also called a hash) may be provided to the Gravatar service to see if you are using it. The Gravatar service privacy policy is available here: https://automattic.com/privacy/. After approval of your comment, your profile picture is visible to the public in the context of your comment.' ) . '</p>' .
 
 			'<h3>' . __( 'Media' ) . '</h3>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information may be disclosed by users who can upload media files. All uploaded files are usually publicly accessible.' ) . '</p>';
-		$content .=
+		$content           .=
 			'<p>' . $suggested_text . __( 'If you upload images to the website, you should avoid uploading images with embedded location data (EXIF GPS) included. Visitors to the website can download and extract any location data from images on the website.' ) . '</p>' .
 
 			'<h3>' . __( 'Contact forms' ) . '</h3>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'By default, WordPress does not include a contact form. If you use a contact form plugin, use this subsection to note what personal data is captured when someone submits a contact form, and how long you keep it. For example, you may note that you keep contact form submissions for a certain period for customer service purposes, but you do not use the information submitted through them for marketing purposes.' ) . '</p>';
 
-		$content .=
+		$content           .=
 			'<h3>' . __( 'Cookies' ) . '</h3>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list the cookies your web site uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '</p>';
-		$content .=
+		$content           .=
 			'<p>' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '</p>' .
 			'<p>' . __( 'If you have an account and you log in to this site, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '</p>' .
 			'<p>' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select &quot;Remember Me&quot;, your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>' .
@@ -1786,63 +1790,63 @@ final class WP_Privacy_Policy_Content {
 			'<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what analytics package you use, how users can opt out of analytics tracking, and a link to your analytics provider&#8217;s privacy policy, if any.' ) . '</p>' .
 			'<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any analytics data. However, many web hosting accounts collect some anonymous analytics data. You may also have installed a WordPress plugin that provides analytics services. In that case, add information from that plugin here.' ) . '</p>';
 
-		$content .=
+		$content           .=
 			'<h2>' . __( 'Who we share your data with' ) . '</h2>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy policies if possible.' ) . '</p>' .
 			'<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not share any personal data with anyone.' ) . '</p>';
 
-		$content .=
+		$content           .=
 			'<h2>' . __( 'How long we retain your data' ) . '</h2>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this section you should explain how long you retain personal data collected or processed by the web site. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '</p>';
-		$content .=
+		$content           .=
 			'<p>' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '</p>' .
 			'<p>' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '</p>' .
 
 			'<h2>' . __( 'What rights you have over your data' ) . '</h2>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '</p>';
-		$content .=
+		$content           .=
 			'<p>' . $suggested_text . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we erase any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '</p>' .
 
 			'<h2>' . __( 'Where we send your data' ) . '</h2>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '</p>' .
 			'<p class="privacy-policy-tutorial">' . __( 'European data protection law requires data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '</p>';
-		$content .=
+		$content           .=
 			'<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>' .
 
 			'<h2>' . __( 'Your contact information' ) . '</h2>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this section you should provide a contact method for privacy-specific concerns. If you are required to have a Data Protection Officer, list their name and full contact details here as well.' ) . '</p>';
 
-		$content .=
+		$content           .=
 			'<h2>' . __( 'Additional information' ) . '</h2>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'If you use your site for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy policy in addition to the information we have already discussed.' ) . '</p>';
 
-		$content .=
+		$content           .=
 			'<h3>' . __( 'How we protect your data' ) . '</h3>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what measures you have taken to protect your users&#8217; data. This could include technical measures such as encryption; security measures such as two factor authentication; and measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '</p>';
 
-		$content .=
+		$content           .=
 			'<h3>' . __( 'What data breach procedures we have in place' ) . '</h3>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what procedures you have in place to deal with data breaches, either potential or real, such as internal reporting systems, contact mechanisms, or bug bounties.' ) . '</p>';
 
-		$content .=
+		$content           .=
 			'<h3>' . __( 'What third parties we receive data from' ) . '</h3>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '</p>';
 
-		$content .=
+		$content           .=
 			'<h3>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h3>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'If your web site provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '</p>';
 
-		$content .=
+		$content           .=
 			'<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>';
 		$descr && $content .=
 			'<p class="privacy-policy-tutorial">' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>' .
diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index c5b73c1752..2b60a22b87 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -961,11 +961,11 @@ function can_edit_network( $network_id ) {
  * @access private
  */
 function _thickbox_path_admin_subfolder() {
-?>
+	?>
 <script type="text/javascript">
 var tb_pathToImage = "<?php echo includes_url( 'js/thickbox/loadingAnimation.gif', 'relative' ); ?>";
 </script>
-<?php
+	<?php
 }
 
 /**
@@ -1065,7 +1065,7 @@ function confirm_delete_users( $users ) {
 				<td><fieldset><p><legend><?php _e( 'User has no sites or content and will be deleted.' ); ?></legend></p>
 			<?php } ?>
 			</tr>
-		<?php
+			<?php
 		}
 	}
 
@@ -1076,7 +1076,7 @@ function confirm_delete_users( $users ) {
 	do_action( 'delete_user_form', $current_user, $allusers );
 
 	if ( 1 == count( $users ) ) :
-	?>
+		?>
 		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
 	<?php else : ?>
 		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
@@ -1084,7 +1084,7 @@ function confirm_delete_users( $users ) {
 	endif;
 
 	submit_button( __( 'Confirm Deletion' ), 'primary' );
-	?>
+?>
 	</form>
 	<?php
 	return true;
@@ -1096,7 +1096,7 @@ function confirm_delete_users( $users ) {
  * @since 4.1.0
  */
 function network_settings_add_js() {
-?>
+	?>
 <script type="text/javascript">
 jQuery(document).ready( function($) {
 	var languageSelect = $( '#WPLANG' );
@@ -1109,7 +1109,7 @@ jQuery(document).ready( function($) {
 	});
 });
 </script>
-<?php
+	<?php
 }
 
 /**
@@ -1147,7 +1147,8 @@ function network_edit_site_nav( $args = array() ) {
 	 * }
 	 */
 	$links = apply_filters(
-		'network_edit_site_nav_links', array(
+		'network_edit_site_nav_links',
+		array(
 			'site-info'     => array(
 				'label' => __( 'Info' ),
 				'url'   => 'site-info.php',
@@ -1173,7 +1174,8 @@ function network_edit_site_nav( $args = array() ) {
 
 	// Parse arguments
 	$r = wp_parse_args(
-		$args, array(
+		$args,
+		array(
 			'blog_id'  => isset( $_GET['blog_id'] ) ? (int) $_GET['blog_id'] : 0,
 			'links'    => $links,
 			'selected' => 'site-info',
diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index 3276b56406..395f787ab7 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -105,7 +105,8 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 			}
 		} elseif ( 'taxonomy' == $matches[1] ) {
 			$terms = get_terms(
-				$matches[2], array(
+				$matches[2],
+				array(
 					'name__like' => $query,
 					'number'     => 10,
 				)
@@ -149,7 +150,8 @@ function wp_nav_menu_setup() {
 	if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
 		$user = wp_get_current_user();
 		update_user_option(
-			$user->ID, 'managenav-menuscolumnshidden',
+			$user->ID,
+			'managenav-menuscolumnshidden',
 			array(
 				0 => 'link-target',
 				1 => 'css-classes',
@@ -439,7 +441,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 			<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
 				<?php
 				$recent_args    = array_merge(
-					$args, array(
+					$args,
+					array(
 						'orderby'        => 'post_date',
 						'order'          => 'DESC',
 						'posts_per_page' => 15,
@@ -530,7 +533,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 					} else {
 						$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
 						array_unshift(
-							$posts, (object) array(
+							$posts,
+							(object) array(
 								'front_or_home' => true,
 								'ID'            => 0,
 								'object_id'     => $_nav_menu_placeholder,
@@ -551,7 +555,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 				if ( $post_type->has_archive ) {
 					$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
 					array_unshift(
-						$posts, (object) array(
+						$posts,
+						(object) array(
 							'ID'           => 0,
 							'object_id'    => $_nav_menu_placeholder,
 							'object'       => $post_type_name,
@@ -677,8 +682,10 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 
 	$num_pages = ceil(
 		wp_count_terms(
-			$taxonomy_name, array_merge(
-				$args, array(
+			$taxonomy_name,
+			array_merge(
+				$args,
+				array(
 					'number' => '',
 					'offset' => '',
 				)
@@ -763,7 +770,8 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 			<ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
 				<?php
 				$popular_terms  = get_terms(
-					$taxonomy_name, array(
+					$taxonomy_name,
+					array(
 						'orderby'      => 'count',
 						'order'        => 'DESC',
 						'number'       => 10,
@@ -800,7 +808,8 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 			if ( isset( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
 				$searched       = esc_attr( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] );
 				$search_results = get_terms(
-					$taxonomy_name, array(
+					$taxonomy_name,
+					array(
 						'name__like'   => $searched,
 						'fields'       => 'all',
 						'orderby'      => 'count',
@@ -1096,7 +1105,8 @@ function _wp_delete_orphaned_draft_menu_items() {
  */
 function wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title ) {
 	$unsorted_menu_items = wp_get_nav_menu_items(
-		$nav_menu_selected_id, array(
+		$nav_menu_selected_id,
+		array(
 			'orderby'     => 'ID',
 			'output'      => ARRAY_A,
 			'output_key'  => 'ID',
diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php
index cefd63f564..9c05ec8d6a 100644
--- a/wp-admin/includes/network.php
+++ b/wp-admin/includes/network.php
@@ -217,7 +217,7 @@ function network_step1( $errors = false ) {
 	}
 
 	if ( allow_subdomain_install() && allow_subdirectory_install() ) :
-	?>
+		?>
 		<h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
 		<p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories.' ); ?>
 			<strong><?php _e( 'You cannot change this later.' ); ?></strong></p>
@@ -250,7 +250,7 @@ function network_step1( $errors = false ) {
 			</tr>
 		</table>
 
-<?php
+		<?php
 	endif;
 
 	if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) {
@@ -282,7 +282,7 @@ function network_step1( $errors = false ) {
 						__( 'The internet address of your network will be %s.' ),
 						'<code>' . $hostname . '</code>'
 					);
-					?>
+				?>
 				</td>
 			</tr>
 		</table>
@@ -411,15 +411,15 @@ function network_step2( $errors = false ) {
 	} else {
 		if ( is_multisite() ) {
 			$subdomain_install = is_subdomain_install();
-?>
+			?>
 	<p><?php _e( 'The original configuration steps are shown here for reference.' ); ?></p>
-<?php
+			<?php
 		} else {
 			$subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
-?>
+			?>
 	<div class="error"><p><strong><?php _e( 'Warning:' ); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
 	<p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
-<?php
+			<?php
 		}
 	}
 
@@ -428,7 +428,7 @@ function network_step2( $errors = false ) {
 	$subdir_replacement_12 = $subdomain_install ? '$1' : '$2';
 
 	if ( $_POST || ! is_multisite() ) {
-?>
+		?>
 		<h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
 		<p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
 		<div class="updated inline"><p>
@@ -459,9 +459,9 @@ function network_step2( $errors = false ) {
 		}
 		?>
 		</p></div>
-<?php
+		<?php
 	}
-?>
+	?>
 		<ol>
 			<li><p>
 			<?php
@@ -487,7 +487,7 @@ define('PATH_CURRENT_SITE', '<?php echo $base; ?>');
 define('SITE_ID_CURRENT_SITE', 1);
 define('BLOG_ID_CURRENT_SITE', 1);
 </textarea>
-<?php
+	<?php
 	$keys_salts = array(
 		'AUTH_KEY'         => '',
 		'SECURE_AUTH_KEY'  => '',
@@ -498,58 +498,58 @@ define('BLOG_ID_CURRENT_SITE', 1);
 		'LOGGED_IN_SALT'   => '',
 		'NONCE_SALT'       => '',
 	);
-foreach ( $keys_salts as $c => $v ) {
-	if ( defined( $c ) ) {
-		unset( $keys_salts[ $c ] );
+	foreach ( $keys_salts as $c => $v ) {
+		if ( defined( $c ) ) {
+			unset( $keys_salts[ $c ] );
+		}
 	}
-}
 
-if ( ! empty( $keys_salts ) ) {
-	$keys_salts_str = '';
-	$from_api       = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
-	if ( is_wp_error( $from_api ) ) {
-		foreach ( $keys_salts as $c => $v ) {
-			$keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
+	if ( ! empty( $keys_salts ) ) {
+		$keys_salts_str = '';
+		$from_api       = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+		if ( is_wp_error( $from_api ) ) {
+			foreach ( $keys_salts as $c => $v ) {
+				$keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
+			}
+		} else {
+			$from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
+			foreach ( $keys_salts as $c => $v ) {
+				$keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
+			}
 		}
-	} else {
-		$from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
-		foreach ( $keys_salts as $c => $v ) {
-			$keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
-		}
-	}
-	$num_keys_salts = count( $keys_salts );
-?>
+		$num_keys_salts = count( $keys_salts );
+		?>
 <p>
-	<?php
-	if ( 1 == $num_keys_salts ) {
-		printf(
-			/* translators: %s: wp-config.php */
-			__( 'This unique authentication key is also missing from your %s file.' ),
-			'<code>wp-config.php</code>'
-		);
-	} else {
-		printf(
-			/* translators: %s: wp-config.php */
-			__( 'These unique authentication keys are also missing from your %s file.' ),
-			'<code>wp-config.php</code>'
-		);
-	}
+		<?php
+		if ( 1 == $num_keys_salts ) {
+			printf(
+				/* translators: %s: wp-config.php */
+				__( 'This unique authentication key is also missing from your %s file.' ),
+				'<code>wp-config.php</code>'
+			);
+		} else {
+			printf(
+				/* translators: %s: wp-config.php */
+				__( 'These unique authentication keys are also missing from your %s file.' ),
+				'<code>wp-config.php</code>'
+			);
+		}
 		?>
 		<?php _e( 'To make your installation more secure, you should also add:' ); ?>
 	</p>
 	<textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
-<?php
-}
-?>
+		<?php
+	}
+	?>
 </li>
-<?php
-if ( iis7_supports_permalinks() ) :
-	// IIS doesn't support RewriteBase, all your RewriteBase are belong to us
-	$iis_subdir_match       = ltrim( $base, '/' ) . $subdir_match;
-	$iis_rewrite_base       = ltrim( $base, '/' ) . $rewrite_base;
-	$iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
+	<?php
+	if ( iis7_supports_permalinks() ) :
+		// IIS doesn't support RewriteBase, all your RewriteBase are belong to us
+		$iis_subdir_match       = ltrim( $base, '/' ) . $subdir_match;
+		$iis_rewrite_base       = ltrim( $base, '/' ) . $rewrite_base;
+		$iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
 
-	$web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
+		$web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <system.webServer>
         <rewrite>
@@ -558,13 +558,13 @@ if ( iis7_supports_permalinks() ) :
                     <match url="^index\.php$" ignoreCase="false" />
                     <action type="None" />
                 </rule>';
-	if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
-		$web_config_file .= '
+		if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+			$web_config_file .= '
                 <rule name="WordPress Rule for Files" stopProcessing="true">
                     <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
                     <action type="Rewrite" url="' . $iis_rewrite_base . WPINC . '/ms-files.php?file={R:1}" appendQueryString="false" />
                 </rule>';
-	}
+		}
 			$web_config_file .= '
                 <rule name="WordPress Rule 2" stopProcessing="true">
                     <match url="^' . $iis_subdir_match . 'wp-admin$" ignoreCase="false" />
@@ -603,16 +603,16 @@ if ( iis7_supports_permalinks() ) :
 				'<code>web.config</code>',
 				'<code>' . $home_path . '</code>'
 			);
-	echo '</p>';
-	if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) {
-		echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
-	}
-	?>
+		echo '</p>';
+		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) {
+			echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+		}
+		?>
 	<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
 		</textarea></li>
 		</ol>
 
-	<?php
+		<?php
 	else : // end iis7_supports_permalinks(). construct an htaccess file instead:
 
 		$ms_files_rewriting = '';
@@ -651,15 +651,15 @@ EOF;
 		}
 		?>
 		<textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
-<?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
+		<?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
 		</ol>
 
-	<?php
+		<?php
 	endif; // end IIS/Apache code branches.
 
 	if ( ! is_multisite() ) {
 		?>
 		<p><?php _e( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.' ); ?> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log In' ); ?></a></p>
-	<?php
+		<?php
 	}
 }
diff --git a/wp-admin/includes/options.php b/wp-admin/includes/options.php
index 2cf257bd80..d60b5588ba 100644
--- a/wp-admin/includes/options.php
+++ b/wp-admin/includes/options.php
@@ -13,7 +13,7 @@
  * @since 4.2.0
  */
 function options_discussion_add_js() {
-?>
+	?>
 	<script>
 	(function($){
 		var parent = $( '#show_avatars' ),
@@ -23,7 +23,7 @@ function options_discussion_add_js() {
 		});
 	})(jQuery);
 	</script>
-<?php
+	<?php
 }
 
 /**
@@ -32,7 +32,7 @@ function options_discussion_add_js() {
  * @since 3.5.0
  */
 function options_general_add_js() {
-?>
+	?>
 <script type="text/javascript">
 	jQuery(document).ready(function($){
 		var $siteName = $( '#wp-admin-bar-site-name' ).children( 'a' ).first(),
@@ -88,7 +88,7 @@ function options_general_add_js() {
 		});
 	});
 </script>
-<?php
+	<?php
 }
 
 /**
@@ -97,7 +97,7 @@ function options_general_add_js() {
  * @since 3.5.0
  */
 function options_reading_add_js() {
-?>
+	?>
 <script type="text/javascript">
 	jQuery(document).ready(function($){
 		var section = $('#front-static-pages'),
@@ -110,7 +110,7 @@ function options_reading_add_js() {
 		 section.find('input:radio').change(check_disabled);
 	});
 </script>
-<?php
+	<?php
 }
 
 /**
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index a3f392d0d1..6081bff05c 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -288,7 +288,8 @@ function install_dashboard() {
 			$tags[ $tag['name'] ] = (object) $data;
 		}
 		echo wp_generate_tag_cloud(
-			$tags, array(
+			$tags,
+			array(
 				'single_text'   => __( '%s plugin' ),
 				'multiple_text' => __( '%s plugins' ),
 			)
@@ -331,7 +332,7 @@ function install_search_form( $deprecated = true ) {
  * @since 2.8.0
  */
 function install_plugins_upload() {
-?>
+	?>
 <div class="upload-plugin">
 	<p class="install-help"><?php _e( 'If you have a plugin in a .zip format, you may install it by uploading it here.' ); ?></p>
 	<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url( 'update.php?action=upload-plugin' ); ?>">
@@ -341,7 +342,7 @@ function install_plugins_upload() {
 		<?php submit_button( __( 'Install Now' ), '', 'install-plugin-submit', false ); ?>
 	</form>
 </div>
-<?php
+	<?php
 }
 
 /**
@@ -501,8 +502,9 @@ function install_plugin_information() {
 	}
 
 	$api = plugins_api(
-		'plugin_information', array(
-			'slug'   => wp_unslash( $_REQUEST['plugin'] ),
+		'plugin_information',
+		array(
+			'slug' => wp_unslash( $_REQUEST['plugin'] ),
 		)
 	);
 
@@ -690,13 +692,13 @@ function install_plugin_information() {
 					'number' => $api->num_ratings,
 				)
 			);
-?>
+			?>
 			<p aria-hidden="true" class="fyi-description"><?php printf( _n( '(based on %s rating)', '(based on %s ratings)', $api->num_ratings ), number_format_i18n( $api->num_ratings ) ); ?></p>
-		<?php
+			<?php
 }
 
 if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
-		?>
+	?>
 			<h3><?php _e( 'Reviews' ); ?></h3>
 			<p class="fyi-description"><?php _e( 'Read all reviews on WordPress.org or write your own!' ); ?></p>
 			<?php
@@ -726,7 +728,7 @@ if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
 			}
 }
 if ( ! empty( $api->contributors ) ) {
-		?>
+	?>
 			<h3><?php _e( 'Contributors' ); ?></h3>
 			<ul class="contributors">
 				<?php
@@ -738,7 +740,7 @@ if ( ! empty( $api->contributors ) ) {
 					$contrib_name = esc_html( $contrib_name );
 
 					$contrib_profile = esc_url( $contrib_details['profile'] );
-					$contrib_avatar = esc_url( add_query_arg( 's', '36', $contrib_details['avatar'] ) );
+					$contrib_avatar  = esc_url( add_query_arg( 's', '36', $contrib_details['avatar'] ) );
 
 					echo "<li><a href='{$contrib_profile}' target='_blank'><img src='{$contrib_avatar}' width='18' height='18' alt='' />{$contrib_name}</a></li>";
 				}
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index bb90aff606..6f6935fac4 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -239,7 +239,8 @@ function edit_post( $post_data = null ) {
 
 	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
 		$revisions = wp_get_post_revisions(
-			$post_ID, array(
+			$post_ID,
+			array(
 				'order'          => 'ASC',
 				'posts_per_page' => 1,
 			)
@@ -955,8 +956,10 @@ function has_meta( $postid ) {
 		$wpdb->prepare(
 			"SELECT meta_key, meta_value, meta_id, post_id
 			FROM $wpdb->postmeta WHERE post_id = %d
-			ORDER BY meta_key,meta_id", $postid
-		), ARRAY_A
+			ORDER BY meta_key,meta_id",
+			$postid
+		),
+		ARRAY_A
 	);
 }
 
@@ -1701,7 +1704,7 @@ function _admin_notice_post_locked() {
 		<a class="button" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a>
 		<?php if ( $preview_link ) { ?>
 		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e( 'Preview' ); ?></a>
-		<?php
+			<?php
 }
 
 		// Allow plugins to prevent some users overriding the post lock
@@ -1711,7 +1714,7 @@ if ( $override ) {
 			<?php
 }
 
-		?>
+?>
 		</p>
 		</div>
 		<?php
@@ -2002,7 +2005,8 @@ function taxonomy_meta_box_sanitize_cb_input( $taxonomy, $terms ) {
 		}
 
 		$_term = get_terms(
-			$taxonomy, array(
+			$taxonomy,
+			array(
 				'name'       => $term,
 				'fields'     => 'ids',
 				'hide_empty' => false,
diff --git a/wp-admin/includes/revision.php b/wp-admin/includes/revision.php
index f431493fc1..1f03ae7108 100644
--- a/wp-admin/includes/revision.php
+++ b/wp-admin/includes/revision.php
@@ -110,7 +110,7 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
 		if ( ! $diff && 'post_title' === $field ) {
 			// It's a better user experience to still show the Title, even if it didn't change.
 			// No, you didn't see this.
-			$diff  = '<table class="diff"><colgroup><col class="content diffsplit left"><col class="content diffsplit middle"><col class="content diffsplit right"></colgroup><tbody><tr>';
+			$diff = '<table class="diff"><colgroup><col class="content diffsplit left"><col class="content diffsplit middle"><col class="content diffsplit right"></colgroup><tbody><tr>';
 
 			// In split screen mode, show the title before/after side by side.
 			if ( true === $args['show_split_view'] ) {
@@ -124,7 +124,7 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
 				}
 			}
 
- 			$diff .= '</tr></tbody>';
+			$diff .= '</tr></tbody>';
 			$diff .= '</table>';
 		}
 
@@ -167,7 +167,8 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null
 	$now_gmt = time();
 
 	$revisions = wp_get_post_revisions(
-		$post->ID, array(
+		$post->ID,
+		array(
 			'order'         => 'ASC',
 			'check_enabled' => false,
 		)
@@ -194,7 +195,9 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null
 		$modified_gmt = strtotime( $revision->post_modified_gmt . ' +0000' );
 		if ( $can_restore ) {
 			$restore_link = str_replace(
-				'&amp;', '&', wp_nonce_url(
+				'&amp;',
+				'&',
+				wp_nonce_url(
 					add_query_arg(
 						array(
 							'revision' => $revision->ID,
@@ -394,7 +397,7 @@ function wp_print_revision_templates() {
 							__( 'Autosave by %s' ),
 							'<span class="author-name">{{ data.attributes.author.name }}</span>'
 						);
-							?>
+						?>
 							</span>
 					<# } else if ( data.attributes.current ) { #>
 						<span class="byline">
@@ -403,7 +406,7 @@ function wp_print_revision_templates() {
 							__( 'Current Revision by %s' ),
 							'<span class="author-name">{{ data.attributes.author.name }}</span>'
 						);
-							?>
+						?>
 							</span>
 					<# } else { #>
 						<span class="byline">
@@ -412,7 +415,7 @@ function wp_print_revision_templates() {
 							__( 'Revision by %s' ),
 							'<span class="author-name">{{ data.attributes.author.name }}</span>'
 						);
-							?>
+						?>
 							</span>
 					<# } #>
 						<span class="time-ago">{{ data.attributes.timeAgo }}</span>
diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index a41f9b5e5b..4611eadc9f 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -1027,7 +1027,8 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 
 	if ( 1 == $network_id ) {
 		$wpdb->insert(
-			$wpdb->site, array(
+			$wpdb->site,
+			array(
 				'domain' => $domain,
 				'path'   => $path,
 			)
@@ -1035,7 +1036,8 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 		$network_id = $wpdb->insert_id;
 	} else {
 		$wpdb->insert(
-			$wpdb->site, array(
+			$wpdb->site,
+			array(
 				'domain' => $domain,
 				'path'   => $path,
 				'id'     => $network_id,
@@ -1082,7 +1084,7 @@ We hope you enjoy your new site. Thanks!
 --The Team @ SITE_NAME'
 	);
 
-	$misc_exts = array(
+	$misc_exts        = array(
 		// Images.
 		'jpg',
 		'jpeg',
@@ -1179,7 +1181,8 @@ We hope you enjoy your new site. Thanks!
 		$current_site->path      = $path;
 		$current_site->site_name = ucfirst( $domain );
 		$wpdb->insert(
-			$wpdb->blogs, array(
+			$wpdb->blogs,
+			array(
 				'site_id'    => $network_id,
 				'blog_id'    => 1,
 				'domain'     => $domain,
@@ -1207,7 +1210,8 @@ We hope you enjoy your new site. Thanks!
 		$errstr   = '';
 		$hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
 		$page     = wp_remote_get(
-			'http://' . $hostname, array(
+			'http://' . $hostname,
+			array(
 				'timeout'     => 5,
 				'httpversion' => '1.1',
 			)
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 2de6c20ffb..22ef697fe9 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -39,7 +39,8 @@ require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' );
  */
 function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true ) {
 	wp_terms_checklist(
-		$post_id, array(
+		$post_id,
+		array(
 			'taxonomy'             => 'category',
 			'descendants_and_self' => $descendants_and_self,
 			'selected_cats'        => $selected_cats,
@@ -128,7 +129,8 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
 		$args['popular_cats'] = $r['popular_cats'];
 	} else {
 		$args['popular_cats'] = get_terms(
-			$taxonomy, array(
+			$taxonomy,
+			array(
 				'fields'       => 'ids',
 				'orderby'      => 'count',
 				'order'        => 'DESC',
@@ -139,7 +141,8 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
 	}
 	if ( $descendants_and_self ) {
 		$categories = (array) get_terms(
-			$taxonomy, array(
+			$taxonomy,
+			array(
 				'child_of'     => $descendants_and_self,
 				'hierarchical' => 0,
 				'hide_empty'   => 0,
@@ -204,7 +207,8 @@ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $ech
 	}
 
 	$terms = get_terms(
-		$taxonomy, array(
+		$taxonomy,
+		array(
 			'orderby'      => 'count',
 			'order'        => 'DESC',
 			'number'       => $number,
@@ -262,7 +266,8 @@ function wp_link_category_checklist( $link_id = 0 ) {
 	}
 
 	$categories = get_terms(
-		'link_category', array(
+		'link_category',
+		array(
 			'orderby'    => 'name',
 			'hide_empty' => 0,
 		)
@@ -404,7 +409,9 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
 	 * @param array  $args    An array of default args.
 	 */
 	$content = apply_filters(
-		'wp_comment_reply', '', array(
+		'wp_comment_reply',
+		'',
+		array(
 			'position' => $position,
 			'checkbox' => $checkbox,
 			'mode'     => $mode,
@@ -424,9 +431,9 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
 		}
 	}
 
-?>
+	?>
 <form method="get">
-<?php if ( $table_row ) : ?>
+	<?php if ( $table_row ) : ?>
 <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
 <?php else : ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
@@ -443,7 +450,9 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
 	<?php
 	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
 	wp_editor(
-		'', 'replycontent', array(
+		'',
+		'replycontent',
+		array(
 			'media_buttons' => false,
 			'tinymce'       => false,
 			'quicktags'     => $quicktags_settings,
@@ -499,13 +508,13 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
 	}
 	?>
 	</fieldset>
-<?php if ( $table_row ) : ?>
+	<?php if ( $table_row ) : ?>
 </td></tr></tbody></table>
-<?php else : ?>
+	<?php else : ?>
 </div></div>
-<?php endif; ?>
+	<?php endif; ?>
 </form>
-<?php
+	<?php
 }
 
 /**
@@ -514,14 +523,14 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
  * @since 2.9.0
  */
 function wp_comment_trashnotice() {
-?>
+	?>
 <div class="hidden" id="trash-undo-holder">
 	<div class="trash-undo-inside"><?php printf( __( 'Comment by %s moved to the trash.' ), '<strong></strong>' ); ?> <span class="undo untrash"><a href="#"><?php _e( 'Undo' ); ?></a></span></div>
 </div>
 <div class="hidden" id="spam-undo-holder">
 	<div class="spam-undo-inside"><?php printf( __( 'Comment by %s marked as spam.' ), '<strong></strong>' ); ?> <span class="undo unspam"><a href="#"><?php _e( 'Undo' ); ?></a></span></div>
 </div>
-<?php
+	<?php
 }
 
 /**
@@ -549,7 +558,7 @@ function list_meta( $meta ) {
 		return;
 	}
 	$count = 0;
-?>
+	?>
 <table id="list-table">
 	<thead>
 	<tr>
@@ -558,14 +567,14 @@ function list_meta( $meta ) {
 	</tr>
 	</thead>
 	<tbody id='the-list' data-wp-lists='list:meta'>
-<?php
-foreach ( $meta as $entry ) {
-	echo _list_meta_row( $entry, $count );
-}
-?>
+	<?php
+	foreach ( $meta as $entry ) {
+		echo _list_meta_row( $entry, $count );
+	}
+	?>
 	</tbody>
 </table>
-<?php
+	<?php
 }
 
 /**
@@ -676,7 +685,7 @@ function meta_form( $post = null ) {
 	} else {
 		$meta_key_input_id = 'metakeyinput';
 	}
-?>
+	?>
 <p><strong><?php _e( 'Add New Custom Field:' ); ?></strong></p>
 <table id="newmeta">
 <thead>
@@ -689,18 +698,18 @@ function meta_form( $post = null ) {
 <tbody>
 <tr>
 <td id="newmetaleft" class="left">
-<?php if ( $keys ) { ?>
+	<?php if ( $keys ) { ?>
 <select id="metakeyselect" name="metakeyselect">
 <option value="#NONE#"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-<?php
+		<?php
 
-foreach ( $keys as $key ) {
-	if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) ) {
-		continue;
-	}
-	echo "\n<option value='" . esc_attr( $key ) . "'>" . esc_html( $key ) . '</option>';
-}
-?>
+		foreach ( $keys as $key ) {
+			if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) ) {
+				continue;
+			}
+			echo "\n<option value='" . esc_attr( $key ) . "'>" . esc_html( $key ) . '</option>';
+		}
+		?>
 </select>
 <input class="hide-if-js" type="text" id="metakeyinput" name="metakeyinput" value="" />
 <a href="#postcustomstuff" class="hide-if-no-js" onclick="jQuery('#metakeyinput, #metakeyselect, #enternew, #cancelnew').toggle();return false;">
@@ -715,20 +724,24 @@ foreach ( $keys as $key ) {
 
 <tr><td colspan="2">
 <div class="submit">
-<?php
-submit_button(
-	__( 'Add Custom Field' ), '', 'addmeta', false, array(
-		'id'            => 'newmeta-submit',
-		'data-wp-lists' => 'add:the-list:newmeta',
-	)
-);
-?>
+	<?php
+	submit_button(
+		__( 'Add Custom Field' ),
+		'',
+		'addmeta',
+		false,
+		array(
+			'id'            => 'newmeta-submit',
+			'data-wp-lists' => 'add:the-list:newmeta',
+		)
+	);
+	?>
 </div>
-<?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
+	<?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
 </td></tr>
 </tbody>
 </table>
-<?php
+	<?php
 
 }
 
@@ -817,13 +830,13 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 		$cur_timeunit = 'cur_' . $timeunit;
 		echo '<input type="hidden" id="' . $cur_timeunit . '" name="' . $cur_timeunit . '" value="' . $curr . '" />' . "\n";
 	}
-?>
+	?>
 
 <p>
 <a href="#edit_timestamp" class="save-timestamp hide-if-no-js button"><?php _e( 'OK' ); ?></a>
 <a href="#edit_timestamp" class="cancel-timestamp hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
 </p>
-<?php
+	<?php
 }
 
 /**
@@ -934,7 +947,7 @@ function wp_import_upload_form( $action ) {
 		<p><strong><?php echo $upload_dir['error']; ?></strong></p></div>
 								<?php
 	else :
-?>
+		?>
 <form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>">
 <p>
 <label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __( 'Maximum size: %s' ), $size ); ?>)
@@ -942,9 +955,9 @@ function wp_import_upload_form( $action ) {
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
-<?php submit_button( __( 'Upload file and import' ), 'primary' ); ?>
+		<?php submit_button( __( 'Upload file and import' ), 'primary' ); ?>
 </form>
-<?php
+		<?php
 	endif;
 }
 
@@ -1243,7 +1256,7 @@ function do_accordion_sections( $screen, $context, $object ) {
 
 	$page = $screen->id;
 
-	$hidden     = get_hidden_meta_boxes( $screen );
+	$hidden = get_hidden_meta_boxes( $screen );
 	?>
 	<div id="side-sortables" class="accordion-container">
 		<ul class="outer-border">
@@ -1317,7 +1330,8 @@ function add_settings_section( $id, $title, $callback, $page ) {
 
 	if ( 'misc' == $page ) {
 		_deprecated_argument(
-			__FUNCTION__, '3.0.0',
+			__FUNCTION__,
+			'3.0.0',
 			/* translators: %s: misc */
 			sprintf(
 				__( 'The "%s" options group has been removed. Use another settings group.' ),
@@ -1329,7 +1343,8 @@ function add_settings_section( $id, $title, $callback, $page ) {
 
 	if ( 'privacy' == $page ) {
 		_deprecated_argument(
-			__FUNCTION__, '3.5.0',
+			__FUNCTION__,
+			'3.5.0',
 			/* translators: %s: privacy */
 			sprintf(
 				__( 'The "%s" options group has been removed. Use another settings group.' ),
@@ -1386,7 +1401,8 @@ function add_settings_field( $id, $title, $callback, $page, $section = 'default'
 
 	if ( 'misc' == $page ) {
 		_deprecated_argument(
-			__FUNCTION__, '3.0.0',
+			__FUNCTION__,
+			'3.0.0',
 			/* translators: %s: misc */
 			sprintf(
 				__( 'The "%s" options group has been removed. Use another settings group.' ),
@@ -1398,7 +1414,8 @@ function add_settings_field( $id, $title, $callback, $page, $section = 'default'
 
 	if ( 'privacy' == $page ) {
 		_deprecated_argument(
-			__FUNCTION__, '3.5.0',
+			__FUNCTION__,
+			'3.5.0',
 			/* translators: %s: privacy */
 			sprintf(
 				__( 'The "%s" options group has been removed. Use another settings group.' ),
@@ -1650,7 +1667,7 @@ function settings_errors( $setting = '', $sanitize = false, $hide_on_update = fa
  * @param string $found_action
  */
 function find_posts_div( $found_action = '' ) {
-?>
+	?>
 	<div id="find-posts" class="find-box" style="display: none;">
 		<div id="find-posts-head" class="find-box-head">
 			<?php _e( 'Attach to existing content' ); ?>
@@ -1676,7 +1693,7 @@ function find_posts_div( $found_action = '' ) {
 			<div class="clear"></div>
 		</div>
 	</div>
-<?php
+	<?php
 }
 
 /**
@@ -1745,11 +1762,11 @@ function iframe_header( $title = '', $deprecated = false ) {
 
 	@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
 	_wp_admin_html_begin();
-?>
+	?>
 <title><?php bloginfo( 'name' ); ?> &rsaquo; <?php echo $title; ?> &#8212; <?php _e( 'WordPress' ); ?></title>
-<?php
-wp_enqueue_style( 'colors' );
-?>
+	<?php
+	wp_enqueue_style( 'colors' );
+	?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
@@ -1761,50 +1778,50 @@ var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
 	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
 	isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
-<?php
-/** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_enqueue_scripts', $hook_suffix );
+	<?php
+	/** This action is documented in wp-admin/admin-header.php */
+	do_action( 'admin_enqueue_scripts', $hook_suffix );
 
-/** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_print_styles-$hook_suffix" );
+	/** This action is documented in wp-admin/admin-header.php */
+	do_action( "admin_print_styles-$hook_suffix" );
 
-/** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_print_styles' );
+	/** This action is documented in wp-admin/admin-header.php */
+	do_action( 'admin_print_styles' );
 
-/** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_print_scripts-$hook_suffix" );
+	/** This action is documented in wp-admin/admin-header.php */
+	do_action( "admin_print_scripts-$hook_suffix" );
 
-/** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_print_scripts' );
+	/** This action is documented in wp-admin/admin-header.php */
+	do_action( 'admin_print_scripts' );
 
-/** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_head-$hook_suffix" );
+	/** This action is documented in wp-admin/admin-header.php */
+	do_action( "admin_head-$hook_suffix" );
 
-/** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_head' );
+	/** This action is documented in wp-admin/admin-header.php */
+	do_action( 'admin_head' );
 
-$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
+	$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
-if ( is_rtl() ) {
-	$admin_body_class .= ' rtl';
-}
+	if ( is_rtl() ) {
+		$admin_body_class .= ' rtl';
+	}
 
-?>
+	?>
 </head>
-<?php
-/** This filter is documented in wp-admin/admin-header.php */
-$admin_body_classes = apply_filters( 'admin_body_class', '' );
-$admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
-?>
+	<?php
+	/** This filter is documented in wp-admin/admin-header.php */
+	$admin_body_classes = apply_filters( 'admin_body_class', '' );
+	$admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
+	?>
 <body
-<?php
-/**
- * @global string $body_id
- */
-if ( isset( $GLOBALS['body_id'] ) ) {
-	echo ' id="' . $GLOBALS['body_id'] . '"';
-}
-?>
+	<?php
+	/**
+	 * @global string $body_id
+	 */
+	if ( isset( $GLOBALS['body_id'] ) ) {
+		echo ' id="' . $GLOBALS['body_id'] . '"';
+	}
+	?>
  class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes; ?>">
 <script type="text/javascript">
 (function(){
@@ -1813,7 +1830,7 @@ c = c.replace(/no-js/, 'js');
 document.body.className = c;
 })();
 </script>
-<?php
+	<?php
 }
 
 /**
@@ -1834,7 +1851,7 @@ function iframe_footer() {
 	global $hook_suffix;
 	?>
 	<div class="hidden">
-<?php
+	<?php
 	/** This action is documented in wp-admin/admin-footer.php */
 	do_action( 'admin_footer', $hook_suffix );
 
@@ -1843,12 +1860,12 @@ function iframe_footer() {
 
 	/** This action is documented in wp-admin/admin-footer.php */
 	do_action( 'admin_print_footer_scripts' );
-?>
+	?>
 	</div>
 <script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
 </body>
 </html>
-<?php
+	<?php
 }
 
 /**
@@ -2013,7 +2030,7 @@ function _media_states( $post ) {
  * @since 2.8.0
  */
 function compression_test() {
-?>
+	?>
 	<script type="text/javascript">
 	var compressionNonce = <?php echo wp_json_encode( wp_create_nonce( 'update_can_compress_scripts' ) ); ?>;
 	var testCompression = {
@@ -2063,7 +2080,7 @@ function compression_test() {
 	};
 	testCompression.check();
 	</script>
-<?php
+	<?php
 }
 
 /**
@@ -2173,7 +2190,7 @@ function _wp_admin_html_begin() {
 		@header( 'X-UA-Compatible: IE=edge' );
 	}
 
-?>
+	?>
 <!DOCTYPE html>
 <!--[if IE 8]>
 <html xmlns="http://www.w3.org/1999/xhtml" class="ie8 <?php echo $admin_html_class; ?>"
@@ -2201,7 +2218,7 @@ function _wp_admin_html_begin() {
 <!--<![endif]-->
 <head>
 <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
-<?php
+	<?php
 }
 
 /**
diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php
index fd93e579b9..6905c10db7 100644
--- a/wp-admin/includes/theme-install.php
+++ b/wp-admin/includes/theme-install.php
@@ -104,19 +104,19 @@ function install_theme_search_form( $type_selector = true ) {
 	<option value="tag" <?php selected( 'tag', $type ); ?>><?php _ex( 'Tag', 'Theme Installer' ); ?></option>
 	</select>
 	<label class="screen-reader-text" for="s">
-	<?php
-	switch ( $type ) {
-		case 'term':
-			_e( 'Search by keyword' );
-			break;
-		case 'author':
-			_e( 'Search by author' );
-			break;
-		case 'tag':
-			_e( 'Search by tag' );
-			break;
-	}
-	?>
+		<?php
+		switch ( $type ) {
+			case 'term':
+				_e( 'Search by keyword' );
+				break;
+			case 'author':
+				_e( 'Search by author' );
+				break;
+			case 'tag':
+				_e( 'Search by tag' );
+				break;
+		}
+		?>
 	</label>
 	<?php else : ?>
 	<label class="screen-reader-text" for="s"><?php _e( 'Search by keyword' ); ?></label>
@@ -124,7 +124,7 @@ function install_theme_search_form( $type_selector = true ) {
 	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr( $term ); ?>" autofocus="autofocus" />
 	<?php submit_button( __( 'Search' ), '', 'search', false ); ?>
 </form>
-<?php
+	<?php
 }
 
 /**
@@ -134,7 +134,7 @@ function install_theme_search_form( $type_selector = true ) {
  */
 function install_themes_dashboard() {
 	install_theme_search_form( false );
-?>
+	?>
 <h4><?php _e( 'Feature Filter' ); ?></h4>
 <p class="install-help"><?php _e( 'Find a theme based on specific features.' ); ?></p>
 
@@ -152,7 +152,7 @@ function install_themes_dashboard() {
 		foreach ( $features as $feature => $feature_name ) {
 			$feature_name = esc_html( $feature_name );
 			$feature      = esc_attr( $feature );
-?>
+			?>
 
 <li>
 	<input type="checkbox" name="features[]" id="feature-id-<?php echo $feature; ?>" value="<?php echo $feature; ?>" />
@@ -162,22 +162,22 @@ function install_themes_dashboard() {
 <?php	} ?>
 </ol>
 <br class="clear" />
-<?php
+		<?php
 	}
 	?>
 
 </div>
 <br class="clear" />
-<?php submit_button( __( 'Find Themes' ), '', 'search' ); ?>
+	<?php submit_button( __( 'Find Themes' ), '', 'search' ); ?>
 </form>
-<?php
+	<?php
 }
 
 /**
  * @since 2.8.0
  */
 function install_themes_upload() {
-?>
+	?>
 <p class="install-help"><?php _e( 'If you have a theme in a .zip format, you may install it by uploading it here.' ); ?></p>
 <form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url( 'update.php?action=upload-theme' ); ?>">
 	<?php wp_nonce_field( 'theme-upload' ); ?>
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 425460e7dd..f67886aaf1 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -183,7 +183,8 @@ function get_theme_update_available( $theme ) {
 				'TB_iframe' => 'true',
 				'width'     => 1024,
 				'height'    => 800,
-			), $update['url']
+			),
+			$update['url']
 		); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
 		$update_url  = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&amp;theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );
 
diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index d8e1fe84d9..171aa84c52 100644
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -34,7 +34,8 @@ function get_core_updates( $options = array() ) {
 		array(
 			'available' => true,
 			'dismissed' => false,
-		), $options
+		),
+		$options
 	);
 	$dismissed = get_site_option( 'dismissed_update_core' );
 
@@ -549,7 +550,8 @@ function wp_theme_update_row( $theme_key, $theme ) {
 			'TB_iframe' => 'true',
 			'width'     => 1024,
 			'height'    => 800,
-		), $current->response[ $theme_key ]['url']
+		),
+		$current->response[ $theme_key ]['url']
 	);
 
 	/** @var WP_MS_Themes_List_Table $wp_list_table */
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 85439b430a..f8b871db49 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -147,7 +147,8 @@ if ( ! function_exists( 'wp_install_defaults' ) ) :
 			$cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
 			if ( $cat_id == null ) {
 				$wpdb->insert(
-					$wpdb->sitecategories, array(
+					$wpdb->sitecategories,
+					array(
 						'cat_ID'            => 0,
 						'cat_name'          => $cat_name,
 						'category_nicename' => $cat_slug,
@@ -162,7 +163,8 @@ if ( ! function_exists( 'wp_install_defaults' ) ) :
 		}
 
 		$wpdb->insert(
-			$wpdb->terms, array(
+			$wpdb->terms,
+			array(
 				'term_id'    => $cat_id,
 				'name'       => $cat_name,
 				'slug'       => $cat_slug,
@@ -170,7 +172,8 @@ if ( ! function_exists( 'wp_install_defaults' ) ) :
 			)
 		);
 		$wpdb->insert(
-			$wpdb->term_taxonomy, array(
+			$wpdb->term_taxonomy,
+			array(
 				'term_id'     => $cat_id,
 				'taxonomy'    => 'category',
 				'description' => '',
@@ -206,7 +209,8 @@ if ( ! function_exists( 'wp_install_defaults' ) ) :
 		}
 
 		$wpdb->insert(
-			$wpdb->posts, array(
+			$wpdb->posts,
+			array(
 				'post_author'           => $user_id,
 				'post_date'             => $now,
 				'post_date_gmt'         => $now_gmt,
@@ -225,7 +229,8 @@ if ( ! function_exists( 'wp_install_defaults' ) ) :
 			)
 		);
 		$wpdb->insert(
-			$wpdb->term_relationships, array(
+			$wpdb->term_relationships,
+			array(
 				'term_taxonomy_id' => $cat_tt_id,
 				'object_id'        => 1,
 			)
@@ -248,7 +253,8 @@ To get started with moderating, editing, and deleting comments, please visit the
 Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.'
 		);
 		$wpdb->insert(
-			$wpdb->comments, array(
+			$wpdb->comments,
+			array(
 				'comment_post_ID'      => 1,
 				'comment_author'       => $first_comment_author,
 				'comment_author_email' => $first_comment_email,
@@ -275,12 +281,14 @@ Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.'
 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
 
 As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!"
-			), admin_url()
+			),
+			admin_url()
 		);
 
 		$first_post_guid = get_option( 'home' ) . '/?page_id=2';
 		$wpdb->insert(
-			$wpdb->posts, array(
+			$wpdb->posts,
+			array(
 				'post_author'           => $user_id,
 				'post_date'             => $now,
 				'post_date_gmt'         => $now_gmt,
@@ -300,7 +308,8 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 			)
 		);
 		$wpdb->insert(
-			$wpdb->postmeta, array(
+			$wpdb->postmeta,
+			array(
 				'post_id'    => 2,
 				'meta_key'   => '_wp_page_template',
 				'meta_value' => 'default',
@@ -323,7 +332,8 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 			$privacy_policy_guid = get_option( 'home' ) . '/?page_id=3';
 
 			$wpdb->insert(
-				$wpdb->posts, array(
+				$wpdb->posts,
+				array(
 					'post_author'           => $user_id,
 					'post_date'             => $now,
 					'post_date_gmt'         => $now_gmt,
@@ -344,7 +354,8 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 				)
 			);
 			$wpdb->insert(
-				$wpdb->postmeta, array(
+				$wpdb->postmeta,
+				array(
 					'post_id'    => 3,
 					'meta_key'   => '_wp_page_template',
 					'meta_value' => 'default',
@@ -355,13 +366,15 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 
 		// Set up default widgets for default theme.
 		update_option(
-			'widget_search', array(
+			'widget_search',
+			array(
 				2              => array( 'title' => '' ),
 				'_multiwidget' => 1,
 			)
 		);
 		update_option(
-			'widget_recent-posts', array(
+			'widget_recent-posts',
+			array(
 				2              => array(
 					'title'  => '',
 					'number' => 5,
@@ -370,7 +383,8 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 			)
 		);
 		update_option(
-			'widget_recent-comments', array(
+			'widget_recent-comments',
+			array(
 				2              => array(
 					'title'  => '',
 					'number' => 5,
@@ -379,7 +393,8 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 			)
 		);
 		update_option(
-			'widget_archives', array(
+			'widget_archives',
+			array(
 				2              => array(
 					'title'    => '',
 					'count'    => 0,
@@ -389,7 +404,8 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 			)
 		);
 		update_option(
-			'widget_categories', array(
+			'widget_categories',
+			array(
 				2              => array(
 					'title'        => '',
 					'count'        => 0,
@@ -400,13 +416,15 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 			)
 		);
 		update_option(
-			'widget_meta', array(
+			'widget_meta',
+			array(
 				2              => array( 'title' => '' ),
 				'_multiwidget' => 1,
 			)
 		);
 		update_option(
-			'sidebars_widgets', array(
+			'sidebars_widgets',
+			array(
 				'wp_inactive_widgets' => array(),
 				'sidebar-1'           => array(
 					0 => 'search-2',
@@ -442,7 +460,8 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 			// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
 			if ( ! is_super_admin( $user_id ) && $user_id != 1 ) {
 				$wpdb->delete(
-					$wpdb->usermeta, array(
+					$wpdb->usermeta,
+					array(
 						'user_id'  => $user_id,
 						'meta_key' => $wpdb->base_prefix . '1_capabilities',
 					)
@@ -564,7 +583,11 @@ We hope you enjoy your new site. Thanks!
 --The WordPress Team
 https://wordpress.org/
 '
-			), $blog_url, $name, $password, $login_url
+			),
+			$blog_url,
+			$name,
+			$password,
+			$login_url
 		);
 
 		@wp_mail( $email, __( 'New WordPress Site' ), $message );
@@ -832,7 +855,8 @@ function upgrade_100() {
 			$cat = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category ) );
 			if ( ! $cat && 0 != $post->post_category ) { // If there's no result
 				$wpdb->insert(
-					$wpdb->post2cat, array(
+					$wpdb->post2cat,
+					array(
 						'post_id'     => $post->ID,
 						'category_id' => $post->post_category,
 					)
@@ -1116,7 +1140,8 @@ function upgrade_160() {
 		$objects = $wpdb->get_results( "SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'" );
 		foreach ( $objects as $object ) {
 			$wpdb->update(
-				$wpdb->posts, array(
+				$wpdb->posts,
+				array(
 					'post_status'    => 'attachment',
 					'post_mime_type' => $object->post_type,
 					'post_type'      => '',
@@ -1234,7 +1259,11 @@ function upgrade_230() {
 		$wpdb->query(
 			$wpdb->prepare(
 				"INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
-		(%d, %s, %s, %d)", $term_id, $name, $slug, $term_group
+		(%d, %s, %s, %d)",
+				$term_id,
+				$name,
+				$slug,
+				$term_group
 			)
 		);
 
@@ -1288,7 +1317,8 @@ function upgrade_230() {
 		}
 
 		$wpdb->insert(
-			$wpdb->term_relationships, array(
+			$wpdb->term_relationships,
+			array(
 				'object_id'        => $post_id,
 				'term_taxonomy_id' => $tt_id,
 			)
@@ -1327,7 +1357,8 @@ function upgrade_230() {
 			$default_link_cat           = $term_id;
 
 			$wpdb->insert(
-				$wpdb->term_taxonomy, array(
+				$wpdb->term_taxonomy,
+				array(
 					'term_id'     => $term_id,
 					'taxonomy'    => 'link_category',
 					'description' => '',
@@ -1355,7 +1386,8 @@ function upgrade_230() {
 				}
 
 				$wpdb->insert(
-					$wpdb->term_relationships, array(
+					$wpdb->term_relationships,
+					array(
 						'object_id'        => $link->link_id,
 						'term_taxonomy_id' => $tt_id,
 					)
@@ -1376,7 +1408,8 @@ function upgrade_230() {
 				continue;
 			}
 			$wpdb->insert(
-				$wpdb->term_relationships, array(
+				$wpdb->term_relationships,
+				array(
 					'object_id'        => $link_id,
 					'term_taxonomy_id' => $tt_id,
 				)
diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index 26b5e49c72..4634c8e318 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -537,7 +537,7 @@ jQuery(document).ready( function($) {
 	});
 });
 </script>
-<?php
+	<?php
 }
 
 /**
@@ -550,12 +550,12 @@ jQuery(document).ready( function($) {
  * @param object $user User data object
  */
 function use_ssl_preference( $user ) {
-?>
+	?>
 	<tr class="user-use-ssl-wrap">
 		<th scope="row"><?php _e( 'Use https' ); ?></th>
 		<td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked( '1', $user->use_ssl ); ?> /> <?php _e( 'Always use https when visiting the admin' ); ?></label></td>
 	</tr>
-<?php
+	<?php
 }
 
 /**
@@ -576,7 +576,10 @@ this email. This invitation will expire in a few days.
 
 Please click the following link to activate your user account:
 %%s'
-		), wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) )
+		),
+		wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
+		home_url(),
+		wp_specialchars_decode( translate_user_role( $role['name'] ) )
 	);
 }
 
@@ -627,10 +630,12 @@ function _wp_privacy_completed_request( $request_id ) {
 
 	update_post_meta( $request_id, '_wp_user_request_completed_timestamp', time() );
 
-	$request = wp_update_post( array(
-		'ID'          => $request_id,
-		'post_status' => 'request-completed',
-	) );
+	$request = wp_update_post(
+		array(
+			'ID'          => $request_id,
+			'post_status' => 'request-completed',
+		)
+	);
 
 	return $request;
 }
@@ -753,29 +758,33 @@ function _wp_personal_data_handle_actions() {
  */
 function _wp_personal_data_cleanup_requests() {
 	/** This filter is documented in wp-includes/user.php */
-	$expires        = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
+	$expires = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
 
-	$requests_query = new WP_Query( array(
-		'post_type'      => 'user_request',
-		'posts_per_page' => -1,
-		'post_status'    => 'request-pending',
-		'fields'         => 'ids',
-		'date_query'     => array(
-			array(
-				'column' => 'post_modified_gmt',
-				'before' => $expires . ' seconds ago',
+	$requests_query = new WP_Query(
+		array(
+			'post_type'      => 'user_request',
+			'posts_per_page' => -1,
+			'post_status'    => 'request-pending',
+			'fields'         => 'ids',
+			'date_query'     => array(
+				array(
+					'column' => 'post_modified_gmt',
+					'before' => $expires . ' seconds ago',
+				),
 			),
-		),
-	) );
+		)
+	);
 
 	$request_ids = $requests_query->posts;
 
 	foreach ( $request_ids as $request_id ) {
-		wp_update_post( array(
-			'ID'            => $request_id,
-			'post_status'   => 'request-failed',
-			'post_password' => '',
-		) );
+		wp_update_post(
+			array(
+				'ID'            => $request_id,
+				'post_status'   => 'request-failed',
+				'post_password' => '',
+			)
+		);
 	}
 }
 
@@ -796,10 +805,12 @@ function _wp_personal_data_export_page() {
 	// "Borrow" xfn.js for now so we don't have to create new files.
 	wp_enqueue_script( 'xfn' );
 
-	$requests_table = new WP_Privacy_Data_Export_Requests_Table( array(
-		'plural'   => 'privacy_requests',
-		'singular' => 'privacy_request',
-	) );
+	$requests_table = new WP_Privacy_Data_Export_Requests_Table(
+		array(
+			'plural'   => 'privacy_requests',
+			'singular' => 'privacy_request',
+		)
+	);
 	$requests_table->process_bulk_action();
 	$requests_table->prepare_items();
 	?>
@@ -867,10 +878,12 @@ function _wp_personal_data_removal_page() {
 	// "Borrow" xfn.js for now so we don't have to create new files.
 	wp_enqueue_script( 'xfn' );
 
-	$requests_table = new WP_Privacy_Data_Removal_Requests_Table( array(
-		'plural'   => 'privacy_requests',
-		'singular' => 'privacy_request',
-	) );
+	$requests_table = new WP_Privacy_Data_Removal_Requests_Table(
+		array(
+			'plural'   => 'privacy_requests',
+			'singular' => 'privacy_request',
+		)
+	);
 
 	$requests_table->process_bulk_action();
 	$requests_table->prepare_items();
@@ -1013,7 +1026,7 @@ function _wp_privacy_hook_requests_page() {
  */
 function _wp_privacy_requests_screen_options() {
 	$args = array(
-		'option'  => str_replace( 'tools_page_', '', get_current_screen()->id ) . '_requests_per_page',
+		'option' => str_replace( 'tools_page_', '', get_current_screen()->id ) . '_requests_per_page',
 	);
 	add_screen_option( 'per_page', $args );
 }
@@ -1175,8 +1188,8 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
 	public function process_bulk_action() {
 		$action      = $this->current_action();
 		$request_ids = isset( $_REQUEST['request_id'] ) ? wp_parse_id_list( wp_unslash( $_REQUEST['request_id'] ) ) : array();
-		
-		$count       = 0;
+
+		$count = 0;
 
 		if ( $request_ids ) {
 			check_admin_referer( 'bulk-privacy_requests' );
@@ -1502,10 +1515,18 @@ class WP_Privacy_Data_Export_Requests_Table extends WP_Privacy_Requests_Table {
 				submit_button( __( 'Retry' ), 'secondary', 'privacy_action_email_retry[' . $item->ID . ']', false );
 				break;
 			case 'request-completed':
-				echo '<a href="' . esc_url( wp_nonce_url( add_query_arg( array(
-					'action'     => 'delete',
-					'request_id' => array( $item->ID ),
-				), admin_url( 'tools.php?page=export_personal_data' ) ), 'bulk-privacy_requests' ) ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
+				echo '<a href="' . esc_url(
+					wp_nonce_url(
+						add_query_arg(
+							array(
+								'action'     => 'delete',
+								'request_id' => array( $item->ID ),
+							),
+							admin_url( 'tools.php?page=export_personal_data' )
+						),
+						'bulk-privacy_requests'
+					)
+				) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
 				break;
 		}
 	}
@@ -1616,10 +1637,18 @@ class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Requests_Table {
 				submit_button( __( 'Retry' ), 'secondary', 'privacy_action_email_retry[' . $item->ID . ']', false );
 				break;
 			case 'request-completed':
-				echo '<a href="' . esc_url( wp_nonce_url( add_query_arg( array(
-					'action'     => 'delete',
-					'request_id' => array( $item->ID ),
-				), admin_url( 'tools.php?page=remove_personal_data' ) ), 'bulk-privacy_requests' ) ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
+				echo '<a href="' . esc_url(
+					wp_nonce_url(
+						add_query_arg(
+							array(
+								'action'     => 'delete',
+								'request_id' => array( $item->ID ),
+							),
+							admin_url( 'tools.php?page=remove_personal_data' )
+						),
+						'bulk-privacy_requests'
+					)
+				) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
 				break;
 		}
 	}
diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php
index 640e00afe4..e16d459cb1 100644
--- a/wp-admin/includes/widgets.php
+++ b/wp-admin/includes/widgets.php
@@ -299,9 +299,9 @@ function wp_widget_control( $sidebar_args ) {
 	</div>
 
 	<div class="widget-description">
-<?php echo ( $widget_description = wp_widget_description( $widget_id ) ) ? "$widget_description\n" : "$widget_title\n"; ?>
+	<?php echo ( $widget_description = wp_widget_description( $widget_id ) ) ? "$widget_description\n" : "$widget_title\n"; ?>
 	</div>
-<?php
+	<?php
 	echo $sidebar_args['after_widget'];
 
 	return $sidebar_args;
diff --git a/wp-admin/index.php b/wp-admin/index.php
index 368dd7dd59..2465aebf66 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -124,7 +124,7 @@ if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) )
 	if ( $hide ) {
 		$classes .= ' hidden';
 	}
-		?>
+	?>
 
 	<div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
 		<?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
diff --git a/wp-admin/install.php b/wp-admin/install.php
index 019e907b35..ce5849204f 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -8,7 +8,7 @@
 
 // Sanity check.
 if ( false ) {
-?>
+	?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -21,7 +21,7 @@ if ( false ) {
 	<p>WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.</p>
 </body>
 </html>
-<?php
+	<?php
 }
 
 /**
@@ -63,7 +63,7 @@ function display_header( $body_classes = '' ) {
 	if ( $body_classes ) {
 		$body_classes = ' ' . $body_classes;
 	}
-?>
+	?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
 <head>
@@ -79,7 +79,7 @@ function display_header( $body_classes = '' ) {
 <body class="wp-core-ui<?php echo $body_classes; ?>">
 <p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
 
-<?php
+	<?php
 } // end display_header()
 
 /**
@@ -108,7 +108,7 @@ function display_setup_form( $error = null ) {
 	$admin_email  = isset( $_POST['admin_email'] ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : '';
 
 	if ( ! is_null( $error ) ) {
-?>
+		?>
 <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
 <p class="message"><?php echo $error; ?></p>
 <?php } ?>
@@ -129,7 +129,7 @@ function display_setup_form( $error = null ) {
 				?>
 				<input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
 				<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>
-			<?php
+				<?php
 			}
 			?>
 			</td>
@@ -189,7 +189,7 @@ function display_setup_form( $error = null ) {
 					<legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </span></legend>
 					<?php
 					if ( has_action( 'blog_privacy_selector' ) ) {
-					?>
+						?>
 						<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked( 1, $blog_public ); ?> />
 						<label for="blog-public"><?php _e( 'Allow search engines to index this site' ); ?></label><br/>
 						<input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked( 0, $blog_public ); ?> />
@@ -199,7 +199,7 @@ function display_setup_form( $error = null ) {
 						/** This action is documented in wp-admin/options-reading.php */
 						do_action( 'blog_privacy_selector' );
 					} else {
-					?>
+						?>
 						<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( 0, $blog_public ); ?> />
 						<?php _e( 'Discourage search engines from indexing this site' ); ?></label>
 						<p class="description"><?php _e( 'It is up to search engines to honor this request.' ); ?></p>
@@ -211,7 +211,7 @@ function display_setup_form( $error = null ) {
 	<p class="step"><?php submit_button( __( 'Install WordPress' ), 'large', 'Submit', false, array( 'id' => 'submit' ) ); ?></p>
 	<input type="hidden" name="language" value="<?php echo isset( $_REQUEST['language'] ) ? esc_attr( $_REQUEST['language'] ) : ''; ?>" />
 </form>
-<?php
+	<?php
 } // end display_setup_form()
 
 // Let's check to make sure WP isn't already installed.
@@ -317,14 +317,14 @@ switch ( $step ) {
 		$scripts_to_print[] = 'user-profile';
 
 		display_header();
-?>
+		?>
 <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
 <p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
 
 <h2><?php _e( 'Information needed' ); ?></h2>
 <p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p>
 
-<?php
+		<?php
 		display_setup_form();
 		break;
 	case 2:
@@ -376,7 +376,7 @@ switch ( $step ) {
 		if ( $error === false ) {
 			$wpdb->show_errors();
 			$result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
-?>
+			?>
 
 <h1><?php _e( 'Success!' ); ?></h1>
 
@@ -390,9 +390,9 @@ switch ( $step ) {
 	<tr>
 		<th><?php _e( 'Password' ); ?></th>
 		<td>
-		<?php
-		if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ) :
-		?>
+			<?php
+			if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ) :
+				?>
 			<code><?php echo esc_html( $result['password'] ); ?></code><br />
 		<?php endif ?>
 			<p><?php echo $result['password_message']; ?></p>
@@ -402,7 +402,7 @@ switch ( $step ) {
 
 <p class="step"><a href="<?php echo esc_url( wp_login_url() ); ?>" class="button button-large"><?php _e( 'Log In' ); ?></a></p>
 
-<?php
+			<?php
 		}
 		break;
 }
diff --git a/wp-admin/maint/repair.php b/wp-admin/maint/repair.php
index ea0a7cb661..e7cb8a9fff 100644
--- a/wp-admin/maint/repair.php
+++ b/wp-admin/maint/repair.php
@@ -161,11 +161,11 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) {
 	} else {
 		echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
 	}
-?>
+	?>
 	<p class="step"><a class="button button-large" href="repair.php?repair=1"><?php _e( 'Repair Database' ); ?></a></p>
 	<p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p>
 	<p class="step"><a class="button button-large" href="repair.php?repair=2"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
-<?php
+	<?php
 }
 ?>
 </body>
diff --git a/wp-admin/media.php b/wp-admin/media.php
index 95fcd28249..40619ea62e 100644
--- a/wp-admin/media.php
+++ b/wp-admin/media.php
@@ -113,18 +113,18 @@ switch ( $action ) {
 			echo "<div id='message' class='$class'><p>$message</p></div>\n";
 		}
 
-	?>
+		?>
 
 	<div class="wrap">
 	<h1 class="wp-heading-inline">
-<?php
-echo esc_html( $title );
-?>
+		<?php
+		echo esc_html( $title );
+		?>
 </h1>
 
-<?php
-if ( current_user_can( 'upload_files' ) ) {
-?>
+		<?php
+		if ( current_user_can( 'upload_files' ) ) {
+			?>
 	<a href="media-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a>
 <?php } ?>
 
@@ -132,39 +132,40 @@ if ( current_user_can( 'upload_files' ) ) {
 
 	<form method="post" class="media-upload-form" id="media-single-form">
 	<p class="submit" style="padding-bottom: 0;">
-	<?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
+		<?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
 	</p>
 
 	<div class="media-single">
 	<div id="media-item-<?php echo $att_id; ?>" class="media-item">
-	<?php
-	echo get_media_item(
-		$att_id, array(
-			'toggle'     => false,
-			'send'       => false,
-			'delete'     => false,
-			'show_title' => false,
-			'errors'     => ! empty( $errors[ $att_id ] ) ? $errors[ $att_id ] : null,
-		)
-	);
-?>
+		<?php
+		echo get_media_item(
+			$att_id,
+			array(
+				'toggle'     => false,
+				'send'       => false,
+				'delete'     => false,
+				'show_title' => false,
+				'errors'     => ! empty( $errors[ $att_id ] ) ? $errors[ $att_id ] : null,
+			)
+		);
+		?>
 	</div>
 	</div>
 
-	<?php submit_button( __( 'Update Media' ), 'primary', 'save' ); ?>
+		<?php submit_button( __( 'Update Media' ), 'primary', 'save' ); ?>
 	<input type="hidden" name="post_id" id="post_id" value="<?php echo isset( $post_id ) ? esc_attr( $post_id ) : ''; ?>" />
 	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $att_id ); ?>" />
 	<input type="hidden" name="action" value="editattachment" />
-	<?php wp_original_referer_field( true, 'previous' ); ?>
-	<?php wp_nonce_field( 'media-form' ); ?>
+		<?php wp_original_referer_field( true, 'previous' ); ?>
+		<?php wp_nonce_field( 'media-form' ); ?>
 
 	</form>
 
 	</div>
 
-	<?php
+		<?php
 
-	require( ABSPATH . 'wp-admin/admin-footer.php' );
+		require( ABSPATH . 'wp-admin/admin-footer.php' );
 
 		exit;
 
diff --git a/wp-admin/ms-delete-site.php b/wp-admin/ms-delete-site.php
index f909204010..b449803878 100644
--- a/wp-admin/ms-delete-site.php
+++ b/wp-admin/ms-delete-site.php
@@ -87,7 +87,7 @@ Webmaster
 
 	<p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked.' ); ?></p>
 
-<?php
+	<?php
 } else {
 	?>
 	<p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.' ), get_network()->site_name ); ?></p>
diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php
index 588afb06a0..174fb2dc84 100644
--- a/wp-admin/my-sites.php
+++ b/wp-admin/my-sites.php
@@ -77,7 +77,7 @@ if ( empty( $blogs ) ) :
 	_e( 'You must be a member of at least one site to use this page.' );
 	echo '</p>';
 else :
-?>
+	?>
 
 <hr class="wp-header-end">
 
diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index 596abe3d71..14652cb9de 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -611,7 +611,8 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 					array(
 						array( 'autofocus' => $focus ),
 						'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
-					), admin_url( 'customize.php' )
+					),
+					admin_url( 'customize.php' )
 				)
 			),
 			__( 'Manage with Live Preview' )
@@ -652,7 +653,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		} else {
 			echo '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
 		}
-	?>
+		?>
 	<div id="menu-locations-wrap">
 		<form method="post" action="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>">
 			<table class="widefat fixed" id="menu-locations-table">
@@ -692,7 +693,8 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 											array(
 												'action' => 'edit',
 												'menu'   => $menu_locations[ $_location ],
-											), admin_url( 'nav-menus.php' )
+											),
+											admin_url( 'nav-menus.php' )
 										)
 									);
 									?>
@@ -710,7 +712,8 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 												'action' => 'edit',
 												'menu'   => 0,
 												'use-location' => $_location,
-											), admin_url( 'nav-menus.php' )
+											),
+											admin_url( 'nav-menus.php' )
 										)
 									);
 									?>
@@ -729,30 +732,32 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
 		</form>
 	</div><!-- #menu-locations-wrap -->
-	<?php
-	/**
-	 * Fires after the menu locations table is displayed.
-	 *
-	 * @since 3.6.0
-	 */
-	do_action( 'after_menu_locations_table' );
-	?>
+		<?php
+		/**
+		 * Fires after the menu locations table is displayed.
+		 *
+		 * @since 3.6.0
+		 */
+		do_action( 'after_menu_locations_table' );
+		?>
 	<?php else : ?>
 	<div class="manage-menus">
 		<?php if ( $menu_count < 2 ) : ?>
 		<span class="add-edit-menu-action">
 			<?php
 			printf(
-				__( 'Edit your menu below, or <a href="%s">create a new menu</a>. Don&#8217;t forget to save your changes!' ), esc_url(
+				__( 'Edit your menu below, or <a href="%s">create a new menu</a>. Don&#8217;t forget to save your changes!' ),
+				esc_url(
 					add_query_arg(
 						array(
 							'action' => 'edit',
 							'menu'   => 0,
-						), admin_url( 'nav-menus.php' )
+						),
+						admin_url( 'nav-menus.php' )
 					)
 				)
 			);
-?>
+			?>
 			<span class="screen-reader-text"><?php _e( 'Click the Save Menu button to save your changes.' ); ?></span>
 		</span><!-- /add-edit-menu-action -->
 		<?php else : ?>
@@ -802,16 +807,18 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 			<span class="add-new-menu-action">
 				<?php
 				printf(
-					__( 'or <a href="%s">create a new menu</a>. Don&#8217;t forget to save your changes!' ), esc_url(
+					__( 'or <a href="%s">create a new menu</a>. Don&#8217;t forget to save your changes!' ),
+					esc_url(
 						add_query_arg(
 							array(
 								'action' => 'edit',
 								'menu'   => 0,
-							), admin_url( 'nav-menus.php' )
+							),
+							admin_url( 'nav-menus.php' )
 						)
 					)
 				);
-?>
+				?>
 				<span class="screen-reader-text"><?php _e( 'Click the Save Menu button to save your changes.' ); ?></span>
 			</span><!-- /add-new-menu-action -->
 		</form>
@@ -819,10 +826,10 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		endif;
 
 		$metabox_holder_disabled_class = '';
-		if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
-			$metabox_holder_disabled_class = ' metabox-holder-disabled';
-		}
-	?>
+if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
+	$metabox_holder_disabled_class = ' metabox-holder-disabled';
+}
+?>
 	</div><!-- /manage-menus -->
 	<div id="nav-menus-frame" class="wp-clearfix">
 	<div id="menu-settings-column" class="metabox-holder<?php echo $metabox_holder_disabled_class; ?>">
@@ -843,9 +850,9 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 			<form id="update-nav-menu" method="post" enctype="multipart/form-data">
 			<?php
 				$new_screen_class = '';
-				if ( $add_new_screen ) {
-					$new_screen_class = 'blank-slate';
-				}
+			if ( $add_new_screen ) {
+				$new_screen_class = 'blank-slate';
+			}
 			?>
 				<h2><?php _e( 'Menu structure' ); ?></h2>
 				<div class="menu-edit <?php echo $new_screen_class; ?>">
@@ -859,9 +866,9 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 					if ( $one_theme_location_no_menus ) {
 						$menu_name_val = 'value="' . esc_attr( 'Menu 1' ) . '"';
-					?>
+						?>
 						<input type="hidden" name="zero-menu-state" value="true" />
-					<?php
+						<?php
 					} else {
 						$menu_name_val = 'value="' . esc_attr( $nav_menu_selected_title ) . '"';
 					}
@@ -880,37 +887,37 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 					<div id="post-body">
 						<div id="post-body-content" class="wp-clearfix">
 							<?php if ( ! $add_new_screen ) : ?>
-							<?php
+								<?php
 								$hide_style = '';
-							if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {
-								$hide_style = 'style="display: none;"';
-							}
+								if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {
+									$hide_style = 'style="display: none;"';
+								}
 								$starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' );
-							?>
+								?>
 							<div class="drag-instructions post-body-plain" <?php echo $hide_style; ?>>
 								<p><?php echo $starter_copy; ?></p>
 							</div>
-							<?php
-							if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
-								echo $edit_markup;
-							} else {
-							?>
+								<?php
+								if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
+									echo $edit_markup;
+								} else {
+									?>
 							<ul class="menu" id="menu-to-edit"></ul>
-							<?php } ?>
+								<?php } ?>
 							<?php endif; ?>
 							<?php if ( $add_new_screen ) : ?>
 								<p class="post-body-plain" id="menu-name-desc"><?php _e( 'Give your menu a name, then click Create Menu.' ); ?></p>
 								<?php if ( isset( $_GET['use-location'] ) ) : ?>
 									<input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
 								<?php endif; ?>
-							<?php
+								<?php
 								endif;
 
 								$no_menus_style = '';
-								if ( $one_theme_location_no_menus ) {
-									$no_menus_style = 'style="display: none;"';
-								}
-							?>
+if ( $one_theme_location_no_menus ) {
+	$no_menus_style = 'style="display: none;"';
+}
+?>
 							<div class="menu-settings" <?php echo $no_menus_style; ?>>
 								<h3><?php _e( 'Menu Settings' ); ?></h3>
 								<?php
@@ -973,8 +980,10 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 											array(
 												'action' => 'delete',
 												'menu'   => $nav_menu_selected_id,
-											), admin_url( 'nav-menus.php' )
-										), 'delete-nav_menu-' . $nav_menu_selected_id
+											),
+											admin_url( 'nav-menus.php' )
+										),
+										'delete-nav_menu-' . $nav_menu_selected_id
 									)
 								);
 								?>
diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index a15462ad4a..1469c70528 100644
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -166,7 +166,7 @@ if ( isset( $_GET['updated'] ) ) {
 					<?php
 					$new_admin_email = get_site_option( 'new_admin_email' );
 					if ( $new_admin_email && $new_admin_email != get_site_option( 'admin_email' ) ) :
-					?>
+						?>
 						<div class="updated inline">
 						<p>
 						<?php
@@ -388,7 +388,7 @@ if ( isset( $_GET['updated'] ) ) {
 							__( '%s KB' ),
 							'<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />'
 						);
-					?>
+						?>
 					<p class="screen-reader-text" id="fileupload-maxk-desc">
 						<?php _e( 'Size in kilobytes' ); ?>
 					</p>
diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index c310e7906d..6d83fdc5ef 100644
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -107,7 +107,8 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
 			array(
 				'update' => 'updated',
 				'id'     => $id,
-			), 'site-info.php'
+			),
+			'site-info.php'
 		)
 	);
 	exit;
@@ -155,15 +156,15 @@ if ( ! empty( $messages ) ) {
 		<?php
 		// The main site of the network should not be updated on this page.
 		if ( $is_main_site ) :
-		?>
+			?>
 		<tr class="form-field">
 			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
 			<td><?php echo esc_url( $parsed_scheme . '://' . $details->domain . $details->path ); ?></td>
 		</tr>
-		<?php
-		// For any other site, the scheme, domain, and path can all be changed.
+			<?php
+			// For any other site, the scheme, domain, and path can all be changed.
 		else :
-		?>
+			?>
 		<tr class="form-field form-required">
 			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
 			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index 70d9f1ca70..f80e7e6a34 100644
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -173,7 +173,8 @@ Name: %3$s'
 				array(
 					'update' => 'added',
 					'id'     => $id,
-				), 'site-new.php'
+				),
+				'site-new.php'
 			)
 		);
 		exit;
@@ -212,13 +213,15 @@ if ( ! empty( $messages ) ) {
 	}
 }
 ?>
-<p><?php
+<p>
+<?php
 printf(
 	/* translators: %s: asterisk to mark required form fields. */
 	__( 'Required fields are marked %s' ),
 	'<span class="required">*</span>'
 );
-?></p>
+?>
+</p>
 <form method="post" action="<?php echo network_admin_url( 'site-new.php?action=add-site' ); ?>" novalidate="novalidate">
 <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ); ?>
 	<table class="form-table">
@@ -227,15 +230,15 @@ printf(
 			<td>
 			<?php if ( is_subdomain_install() ) { ?>
 				<input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required /><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', get_network()->domain ); ?></span>
-			<?php
+				<?php
 } else {
 	echo get_network()->domain . get_network()->path
 	?>
 				<input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required />
-<?php
+	<?php
 }
 			echo '<p class="description" id="site-address-desc">' . __( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ) . '</p>';
-			?>
+?>
 			</td>
 		</tr>
 		<tr class="form-field form-required">
diff --git a/wp-admin/network/site-settings.php b/wp-admin/network/site-settings.php
index 488a541abc..e5a879cfa4 100644
--- a/wp-admin/network/site-settings.php
+++ b/wp-admin/network/site-settings.php
@@ -65,7 +65,8 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] && is_
 			array(
 				'update' => 'updated',
 				'id'     => $id,
-			), 'site-settings.php'
+			),
+			'site-settings.php'
 		)
 	);
 	exit;
@@ -138,14 +139,14 @@ if ( ! empty( $messages ) ) {
 				}
 			}
 			if ( strpos( $option->option_value, "\n" ) !== false ) {
-			?>
+				?>
 				<tr class="form-field">
 					<th scope="row"><label for="<?php echo esc_attr( $option->option_name ); ?>"><?php echo ucwords( str_replace( '_', ' ', $option->option_name ) ); ?></label></th>
 					<td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ); ?>]" id="<?php echo esc_attr( $option->option_name ); ?>"<?php disabled( $disabled ); ?>><?php echo esc_textarea( $option->option_value ); ?></textarea></td>
 				</tr>
-			<?php
+				<?php
 			} else {
-			?>
+				?>
 				<tr class="form-field">
 					<th scope="row"><label for="<?php echo esc_attr( $option->option_name ); ?>"><?php echo esc_html( ucwords( str_replace( '_', ' ', $option->option_name ) ) ); ?></label></th>
 					<?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
@@ -154,7 +155,7 @@ if ( ! empty( $messages ) ) {
 					<td><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr( $option->option_name ); ?>]" type="text" id="<?php echo esc_attr( $option->option_name ); ?>" value="<?php echo esc_attr( $option->option_value ); ?>" size="40" <?php disabled( $disabled ); ?> /></td>
 					<?php } ?>
 				</tr>
-			<?php
+				<?php
 			}
 		} // End foreach
 		/**
diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php
index 497de2aa98..2e53376446 100644
--- a/wp-admin/network/site-themes.php
+++ b/wp-admin/network/site-themes.php
@@ -151,7 +151,8 @@ if ( $action ) {
 			array(
 				'id'    => $id,
 				$action => $n,
-			), $referer
+			),
+			$referer
 		)
 	);
 	exit;
diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index 86f858ec99..5689014f2d 100644
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -296,7 +296,7 @@ do_action( 'network_site_users_after_list_table' );
 
 /** This filter is documented in wp-admin/network/site-users.php */
 if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) :
-?>
+	?>
 <h2 id="add-existing-user"><?php _e( 'Add Existing User' ); ?></h2>
 <form action="site-users.php?action=adduser" id="adduser" method="post">
 	<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
@@ -330,7 +330,7 @@ if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_us
  * @param bool $bool Whether to show the Add New User form. Default true.
  */
 if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) :
-?>
+	?>
 <h2 id="add-new-user"><?php _e( 'Add New User' ); ?></h2>
 <form action="<?php echo network_admin_url( 'site-users.php?action=newuser' ); ?>" id="newuser" method="post">
 	<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index fbfa8b46b7..c36971c920 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -181,14 +181,16 @@ if ( $action ) {
 
 			foreach ( $themes as $theme ) {
 				$delete_result = delete_theme(
-					$theme, esc_url(
+					$theme,
+					esc_url(
 						add_query_arg(
 							array(
 								'verify-delete' => 1,
 								'action'        => 'delete-selected',
 								'checked'       => $_REQUEST['checked'],
 								'_wpnonce'      => $_REQUEST['_wpnonce'],
-							), network_admin_url( 'themes.php' )
+							),
+							network_admin_url( 'themes.php' )
 						)
 					)
 				);
@@ -201,7 +203,8 @@ if ( $action ) {
 						'deleted' => count( $themes ),
 						'paged'   => $paged,
 						's'       => $s,
-					), network_admin_url( 'themes.php' )
+					),
+					network_admin_url( 'themes.php' )
 				)
 			);
 			exit;
diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index 3cc16a1721..9113f74035 100644
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -82,7 +82,8 @@ switch ( $action ) {
 			echo "<li>$siteurl</li>";
 
 			$response = wp_remote_get(
-				$upgrade_url, array(
+				$upgrade_url,
+				array(
 					'timeout'     => 120,
 					'httpversion' => '1.1',
 					'sslverify'   => false,
@@ -131,7 +132,7 @@ switch ( $action ) {
 	case 'show':
 	default:
 		if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
-		?>
+			?>
 		<h2><?php _e( 'Database Update Required' ); ?></h2>
 		<p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>
 		<?php endif; ?>
diff --git a/wp-admin/network/user-new.php b/wp-admin/network/user-new.php
index 5a230e069e..202ff90ecb 100644
--- a/wp-admin/network/user-new.php
+++ b/wp-admin/network/user-new.php
@@ -66,7 +66,8 @@ if ( isset( $_REQUEST['action'] ) && 'add-user' == $_REQUEST['action'] ) {
 					array(
 						'update'  => 'added',
 						'user_id' => $user_id,
-					), 'user-new.php'
+					),
+					'user-new.php'
 				)
 			);
 			exit;
@@ -109,7 +110,7 @@ if ( ! empty( $messages ) ) {
 }
 
 if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) {
-?>
+	?>
 	<div class="error">
 		<?php
 		foreach ( $add_user_errors->get_error_messages() as $message ) {
diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index 3ae8f6f1b6..7f212329f6 100644
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@@ -113,7 +113,8 @@ if ( isset( $_GET['action'] ) ) {
 						array(
 							'updated' => 'true',
 							'action'  => $userfunction,
-						), wp_get_referer()
+						),
+						wp_get_referer()
 					)
 				);
 			} else {
@@ -169,7 +170,8 @@ if ( isset( $_GET['action'] ) ) {
 					array(
 						'updated' => 'true',
 						'action'  => $deletefunction,
-					), network_admin_url( 'users.php' )
+					),
+					network_admin_url( 'users.php' )
 				)
 			);
 			exit();
@@ -245,13 +247,13 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
 	</p></div>
 	<?php
 }
-	?>
+?>
 <div class="wrap">
 	<h1 class="wp-heading-inline"><?php esc_html_e( 'Users' ); ?></h1>
 
 	<?php
 	if ( current_user_can( 'create_users' ) ) :
-	?>
+		?>
 		<a href="<?php echo network_admin_url( 'user-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
 							<?php
 	endif;
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 7402a5f1de..f06c52fa46 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -80,7 +80,7 @@ if ( ! is_multisite() ) {
 	if ( defined( 'WP_HOME' ) ) {
 		$wp_home_class = ' disabled';
 	}
-?>
+	?>
 
 <tr>
 <th scope="row"><label for="siteurl"><?php _e( 'WordPress Address (URL)' ); ?></label></th>
@@ -90,15 +90,15 @@ if ( ! is_multisite() ) {
 <tr>
 <th scope="row"><label for="home"><?php _e( 'Site Address (URL)' ); ?></label></th>
 <td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php echo $wp_home_class; ?>" />
-<?php if ( ! defined( 'WP_HOME' ) ) : ?>
+	<?php if ( ! defined( 'WP_HOME' ) ) : ?>
 <p class="description" id="home-description">
-<?php
-	printf(
-		/* translators: %s: Codex URL */
-		__( 'Enter the address here if you <a href="%s">want your site home page to be different from your WordPress installation directory</a>.' ),
-		__( 'https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory' )
-	);
-?>
+		<?php
+		printf(
+			/* translators: %s: Codex URL */
+			__( 'Enter the address here if you <a href="%s">want your site home page to be different from your WordPress installation directory</a>.' ),
+			__( 'https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory' )
+		);
+		?>
 </p>
 <?php endif; ?>
 </td>
@@ -113,7 +113,7 @@ if ( ! is_multisite() ) {
 <?php
 $new_admin_email = get_option( 'new_admin_email' );
 if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) :
-?>
+	?>
 	<div class="updated inline">
 	<p>
 	<?php
@@ -140,7 +140,7 @@ if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) :
 <th scope="row"><?php _e( 'Membership' ); ?></th>
 <td> <fieldset><legend class="screen-reader-text"><span><?php _e( 'Membership' ); ?></span></legend><label for="users_can_register">
 <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked( '1', get_option( 'users_can_register' ) ); ?> />
-<?php _e( 'Anyone can register' ); ?></label>
+	<?php _e( 'Anyone can register' ); ?></label>
 </fieldset></td>
 </tr>
 
@@ -151,7 +151,7 @@ if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) :
 </td>
 </tr>
 
-<?php
+	<?php
 }
 
 $languages    = get_available_languages();
@@ -241,7 +241,7 @@ if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
 			'<abbr>' . __( 'UTC' ) . '</abbr>',
 			'<code>' . date_i18n( $timezone_format, false, true ) . '</code>'
 		);
-	?>
+		?>
 	</span>
 <?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
 	<span id="local-time">
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index c45e8ccbd0..a56c879a9d 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -96,28 +96,28 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
  * @global array $wp_settings
  */
 if ( isset( $GLOBALS['wp_settings']['media']['embeds'] ) ) :
-?>
+	?>
 <h2 class="title"><?php _e( 'Embeds' ); ?></h2>
 <table class="form-table">
-<?php do_settings_fields( 'media', 'embeds' ); ?>
+	<?php do_settings_fields( 'media', 'embeds' ); ?>
 </table>
 <?php endif; ?>
 
 <?php if ( ! is_multisite() ) : ?>
 <h2 class="title"><?php _e( 'Uploading Files' ); ?></h2>
 <table class="form-table">
-<?php
-// If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty)
-if ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) :
-?>
+	<?php
+	// If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty)
+	if ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) :
+		?>
 <tr>
 <th scope="row"><label for="upload_path"><?php _e( 'Store uploads in this folder' ); ?></label></th>
 <td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr( get_option( 'upload_path' ) ); ?>" class="regular-text code" />
 <p class="description">
-<?php
-	/* translators: %s: wp-content/uploads */
-	printf( __( 'Default is %s' ), '<code>wp-content/uploads</code>' );
-?>
+		<?php
+		/* translators: %s: wp-content/uploads */
+		printf( __( 'Default is %s' ), '<code>wp-content/uploads</code>' );
+		?>
 </p>
 </td>
 </tr>
@@ -136,12 +136,12 @@ if ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-con
 <?php endif; ?>
 <label for="uploads_use_yearmonth_folders">
 <input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1"<?php checked( '1', get_option( 'uploads_use_yearmonth_folders' ) ); ?> />
-<?php _e( 'Organize my uploads into month- and year-based folders' ); ?>
+	<?php _e( 'Organize my uploads into month- and year-based folders' ); ?>
 </label>
 </td>
 </tr>
 
-<?php do_settings_fields( 'media', 'uploads' ); ?>
+	<?php do_settings_fields( 'media', 'uploads' ); ?>
 </table>
 <?php endif; ?>
 
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index e91117412c..e934662571 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -176,7 +176,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 			__( 'WordPress offers you the ability to create a custom URL structure for your permalinks and archives. Custom URL structures can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="%s">number of tags are available</a>, and here are some examples to get you started.' ),
 			__( 'https://codex.wordpress.org/Using_Permalinks' )
 		);
-	?>
+		?>
 	</p>
 
 <?php
@@ -317,39 +317,39 @@ printf( __( 'If you like, you may enter custom structures for your category and
 <?php submit_button(); ?>
 </form>
 <?php if ( ! is_multisite() ) { ?>
-<?php
-if ( $iis7_permalinks ) :
-	if ( isset( $_POST['submit'] ) && $permalink_structure && ! $using_index_permalinks && ! $writable ) :
-		if ( file_exists( $home_path . 'web.config' ) ) :
-		?>
+	<?php
+	if ( $iis7_permalinks ) :
+		if ( isset( $_POST['submit'] ) && $permalink_structure && ! $using_index_permalinks && ! $writable ) :
+			if ( file_exists( $home_path . 'web.config' ) ) :
+				?>
 <p>
-<?php
-	printf(
-		/* translators: 1: web.config, 2: Codex URL, 3: CTRL + a, 4: element code */
-		__( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your %1$s file. Click in the field and press %3$s to select all. Then insert this rule inside of the %4$s element in %1$s file.' ),
-		'<code>web.config</code>',
-		__( 'https://codex.wordpress.org/Changing_File_Permissions' ),
-		'<kbd>CTRL + a</kbd>',
-		'<code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code>'
-	);
-?>
+				<?php
+				printf(
+					/* translators: 1: web.config, 2: Codex URL, 3: CTRL + a, 4: element code */
+					__( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your %1$s file. Click in the field and press %3$s to select all. Then insert this rule inside of the %4$s element in %1$s file.' ),
+					'<code>web.config</code>',
+					__( 'https://codex.wordpress.org/Changing_File_Permissions' ),
+					'<kbd>CTRL + a</kbd>',
+					'<code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code>'
+				);
+				?>
 </p>
 <form action="options-permalink.php" method="post">
-<?php wp_nonce_field( 'update-permalink' ); ?>
+				<?php wp_nonce_field( 'update-permalink' ); ?>
 	<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
 </form>
 <p>
-<?php
-	printf(
-		/* translators: %s: web.config */
-		__( 'If you temporarily make your %s file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.' ),
-		'<code>web.config</code>'
-	);
-?>
+				<?php
+				printf(
+					/* translators: %s: web.config */
+					__( 'If you temporarily make your %s file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.' ),
+					'<code>web.config</code>'
+				);
+				?>
 </p>
 		<?php else : ?>
 <p>
-<?php
+	<?php
 	printf(
 		/* translators: 1: Codex URL, 2: web.config, 3: CTRL + a */
 		__( 'If the root directory of your site was <a href="%1$s">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your %2$s file. Create a new file, called %2$s in the root directory of your site. Click in the field and press %3$s to select all. Then insert this code into the %2$s file.' ),
@@ -357,42 +357,42 @@ if ( $iis7_permalinks ) :
 		'<code>web.config</code>',
 		'<kbd>CTRL + a</kbd>'
 	);
-?>
+	?>
 </p>
 <form action="options-permalink.php" method="post">
-<?php wp_nonce_field( 'update-permalink' ); ?>
+	<?php wp_nonce_field( 'update-permalink' ); ?>
 	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules( true ) ); ?></textarea></p>
 </form>
 <p>
-<?php
+	<?php
 	printf(
 		/* translators: %s: web.config */
 		__( 'If you temporarily make your site&#8217;s root directory writable for us to generate the %s file automatically, do not forget to revert the permissions after the file has been created.' ),
 		'<code>web.config</code>'
 	);
-?>
+	?>
 </p>
 		<?php endif; ?>
 	<?php endif; ?>
 <?php elseif ( $is_nginx ) : ?>
 	<p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
-<?php
+	<?php
 else :
 	if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) :
-	?>
+		?>
 <p>
-<?php
-	printf(
-		/* translators: 1: .htaccess, 2: Codex URL, 3: CTRL + a */
-		__( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s to select all.' ),
-		'<code>.htaccess</code>',
-		__( 'https://codex.wordpress.org/Changing_File_Permissions' ),
-		'<kbd>CTRL + a</kbd>'
-	);
-?>
+		<?php
+		printf(
+			/* translators: 1: .htaccess, 2: Codex URL, 3: CTRL + a */
+			__( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s to select all.' ),
+			'<code>.htaccess</code>',
+			__( 'https://codex.wordpress.org/Changing_File_Permissions' ),
+			'<kbd>CTRL + a</kbd>'
+		);
+		?>
 </p>
 <form action="options-permalink.php" method="post">
-<?php wp_nonce_field( 'update-permalink' ); ?>
+		<?php wp_nonce_field( 'update-permalink' ); ?>
 	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p>
 </form>
 	<?php endif; ?>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 313046cf30..7131e29b15 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -62,16 +62,16 @@ if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', '
 <?php if ( ! get_pages() ) : ?>
 <input name="show_on_front" type="hidden" value="posts" />
 <table class="form-table">
-<?php
-if ( 'posts' != get_option( 'show_on_front' ) ) :
-	update_option( 'show_on_front', 'posts' );
+	<?php
+	if ( 'posts' != get_option( 'show_on_front' ) ) :
+		update_option( 'show_on_front', 'posts' );
 	endif;
 
 else :
 	if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) ) {
 		update_option( 'show_on_front', 'posts' );
 	}
-?>
+	?>
 <table class="form-table">
 <tr>
 <th scope="row"><?php _e( 'Your homepage displays' ); ?></th>
@@ -90,7 +90,8 @@ else :
 	<li><label for="page_on_front">
 	<?php
 	printf(
-		__( 'Homepage: %s' ), wp_dropdown_pages(
+		__( 'Homepage: %s' ),
+		wp_dropdown_pages(
 			array(
 				'name'              => 'page_on_front',
 				'echo'              => 0,
@@ -100,12 +101,13 @@ else :
 			)
 		)
 	);
-?>
+	?>
 </label></li>
 	<li><label for="page_for_posts">
 	<?php
 	printf(
-		__( 'Posts page: %s' ), wp_dropdown_pages(
+		__( 'Posts page: %s' ),
+		wp_dropdown_pages(
 			array(
 				'name'              => 'page_for_posts',
 				'echo'              => 0,
@@ -115,10 +117,10 @@ else :
 			)
 		)
 	);
-?>
+	?>
 </label></li>
 </ul>
-<?php if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == get_option( 'page_on_front' ) ) : ?>
+	<?php if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == get_option( 'page_on_front' ) ) : ?>
 <div id="front-page-warning" class="error inline"><p><?php _e( '<strong>Warning:</strong> these pages should not be the same!' ); ?></p></div>
 <?php endif; ?>
 </fieldset></td>
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index d9eb5c8429..4f77a20fa3 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -69,7 +69,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Formatting' ); ?></span></legend>
 <label for="use_smilies">
 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked( '1', get_option( 'use_smilies' ) ); ?> />
-<?php _e( 'Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display' ); ?></label><br />
+	<?php _e( 'Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display' ); ?></label><br />
 <label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked( '1', get_option( 'use_balanceTags' ) ); ?> /> <?php _e( 'WordPress should correct invalidly nested XHTML automatically' ); ?></label>
 </fieldset></td>
 </tr>
@@ -107,22 +107,22 @@ unset( $post_formats['standard'] );
 </tr>
 <?php
 if ( get_option( 'link_manager_enabled' ) ) :
-?>
+	?>
 <tr>
 <th scope="row"><label for="default_link_category"><?php _e( 'Default Link Category' ); ?></label></th>
 <td>
-<?php
-wp_dropdown_categories(
-	array(
-		'hide_empty'   => 0,
-		'name'         => 'default_link_category',
-		'orderby'      => 'name',
-		'selected'     => get_option( 'default_link_category' ),
-		'hierarchical' => true,
-		'taxonomy'     => 'link_category',
-	)
-);
-?>
+	<?php
+	wp_dropdown_categories(
+		array(
+			'hide_empty'   => 0,
+			'name'         => 'default_link_category',
+			'orderby'      => 'name',
+			'selected'     => get_option( 'default_link_category' ),
+			'hierarchical' => true,
+			'taxonomy'     => 'link_category',
+		)
+	);
+	?>
 </td>
 </tr>
 <?php endif; ?>
@@ -136,18 +136,18 @@ do_settings_fields( 'writing', 'remote_publishing' ); // A deprecated section.
 <?php
 /** This filter is documented in wp-admin/options.php */
 if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
-?>
+	?>
 <h2 class="title"><?php _e( 'Post via email' ); ?></h2>
 <p>
-<?php
-printf(
-	/* translators: 1, 2, 3: examples of random email addresses */
-	__( 'To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: %1$s, %2$s, %3$s.' ),
-	sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
-	sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
-	sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) )
-);
-?>
+	<?php
+	printf(
+		/* translators: 1, 2, 3: examples of random email addresses */
+		__( 'To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: %1$s, %2$s, %3$s.' ),
+		sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
+		sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
+		sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) )
+	);
+	?>
 </p>
 
 <table class="form-table">
@@ -171,20 +171,20 @@ printf(
 <tr>
 <th scope="row"><label for="default_email_category"><?php _e( 'Default Mail Category' ); ?></label></th>
 <td>
-<?php
-wp_dropdown_categories(
-	array(
-		'hide_empty'   => 0,
-		'name'         => 'default_email_category',
-		'orderby'      => 'name',
-		'selected'     => get_option( 'default_email_category' ),
-		'hierarchical' => true,
-	)
-);
-?>
+	<?php
+	wp_dropdown_categories(
+		array(
+			'hide_empty'   => 0,
+			'name'         => 'default_email_category',
+			'orderby'      => 'name',
+			'selected'     => get_option( 'default_email_category' ),
+			'hierarchical' => true,
+		)
+	);
+	?>
 </td>
 </tr>
-<?php do_settings_fields( 'writing', 'post_via_email' ); ?>
+	<?php do_settings_fields( 'writing', 'post_via_email' ); ?>
 </table>
 <?php } ?>
 
@@ -197,37 +197,37 @@ wp_dropdown_categories(
  * @param bool $enable Whether to enable the Update Services settings area. Default true.
  */
 if ( apply_filters( 'enable_update_services_configuration', true ) ) {
-?>
+	?>
 <h2 class="title"><?php _e( 'Update Services' ); ?></h2>
 
-<?php if ( 1 == get_option( 'blog_public' ) ) : ?>
+	<?php if ( 1 == get_option( 'blog_public' ) ) : ?>
 
 	<p><label for="ping_sites">
-	<?php
+		<?php
 		printf(
 			/* translators: %s: Codex URL */
 			__( 'When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="%s">Update Services</a> on the Codex. Separate multiple service URLs with line breaks.' ),
 			__( 'https://codex.wordpress.org/Update_Services' )
 		);
-	?>
+		?>
 	</label></p>
 
 	<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option( 'ping_sites' ) ); ?></textarea>
 
-<?php else : ?>
+	<?php else : ?>
 
 	<p>
-	<?php
+		<?php
 		printf(
 			/* translators: 1: Codex URL, 2: Reading Settings URL */
 			__( 'WordPress is not notifying any <a href="%1$s">Update Services</a> because of your site&#8217;s <a href="%2$s">visibility settings</a>.' ),
 			__( 'https://codex.wordpress.org/Update_Services' ),
 			'options-reading.php'
 		);
-	?>
+		?>
 	</p>
 
-<?php endif; ?>
+	<?php endif; ?>
 <?php } // enable_update_services_configuration ?>
 
 <?php do_settings_sections( 'writing' ); ?>
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 95f913f496..3bf95c1810 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -80,8 +80,8 @@ if ( is_multisite() && ! current_user_can( 'manage_network_options' ) && 'update
 	);
 }
 
-$whitelist_options = array(
-	'general' => array(
+$whitelist_options         = array(
+	'general'    => array(
 		'blogname',
 		'blogdescription',
 		'gmt_offset',
@@ -118,7 +118,7 @@ $whitelist_options = array(
 		'comment_registration',
 		'show_comments_cookies_opt_in',
 	),
-	'media' => array(
+	'media'      => array(
 		'thumbnail_size_w',
 		'thumbnail_size_h',
 		'thumbnail_crop',
@@ -130,7 +130,7 @@ $whitelist_options = array(
 		'image_default_align',
 		'image_default_link_type',
 	),
-	'reading' => array(
+	'reading'    => array(
 		'posts_per_page',
 		'posts_per_rss',
 		'rss_use_excerpt',
@@ -139,7 +139,7 @@ $whitelist_options = array(
 		'page_for_posts',
 		'blog_public',
 	),
-	'writing' => array(
+	'writing'    => array(
 		'default_category',
 		'default_email_category',
 		'default_link_category',
@@ -261,7 +261,8 @@ if ( 'update' == $action ) {
 		foreach ( $options as $option ) {
 			if ( $unregistered ) {
 				_deprecated_argument(
-					'options.php', '2.7.0',
+					'options.php',
+					'2.7.0',
 					sprintf(
 						/* translators: %s: the option/setting */
 						__( 'The %s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ),
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index 81fcd0978a..ccdd832e86 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -298,7 +298,7 @@ if ( ! in_array( 'plugin_editor_notice', $dismissed_pointers, true ) ) :
 	} else {
 		$return_url = admin_url( '/' );
 	}
-?>
+	?>
 <div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">
 	<div class="notification-dialog-background"></div>
 	<div class="notification-dialog">
@@ -315,7 +315,7 @@ if ( ! in_array( 'plugin_editor_notice', $dismissed_pointers, true ) ) :
 		</div>
 	</div>
 </div>
-<?php
+	<?php
 endif; // editor warning notice
 
 include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index b482f474c0..4d8c797b04 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -492,15 +492,16 @@ if ( isset( $_GET['error'] ) ) :
 				'action'   => 'error_scrape',
 				'plugin'   => urlencode( $plugin ),
 				'_wpnonce' => urlencode( $_GET['_error_nonce'] ),
-			), admin_url( 'plugins.php' )
+			),
+			admin_url( 'plugins.php' )
 		);
-	?>
+		?>
 	<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url( $iframe_url ); ?>"></iframe>
-	<?php
+		<?php
 	}
 	?>
 	</div>
-<?php
+	<?php
 elseif ( isset( $_GET['deleted'] ) ) :
 		$delete_result = get_transient( 'plugins_delete_result_' . $user_ID );
 		// Delete it once we're done.
@@ -543,9 +544,9 @@ echo esc_html( $title );
 
 <?php
 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can( 'install_plugins' ) ) {
-?>
+	?>
 	<a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'plugin' ); ?></a>
-<?php
+	<?php
 }
 
 if ( strlen( $s ) ) {
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 7fe38636af..87743bec95 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -242,7 +242,8 @@ switch ( $action ) {
 				array(
 					'trashed' => 1,
 					'ids'     => $post_id,
-				), $sendback
+				),
+				$sendback
 			)
 		);
 		exit();
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index c021aa6b3d..666e42b771 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -33,8 +33,10 @@ function wp_load_press_this() {
 						'action' => 'activate',
 						'plugin' => $plugin_file,
 						'from'   => 'press-this',
-					), admin_url( 'plugins.php' )
-				), 'activate-plugin_' . $plugin_file
+					),
+					admin_url( 'plugins.php' )
+				),
+				'activate-plugin_' . $plugin_file
 			);
 			$action = sprintf(
 				'<a href="%1$s" aria-label="%2$s">%2$s</a>',
@@ -49,8 +51,10 @@ function wp_load_press_this() {
 							'action' => 'install-plugin',
 							'plugin' => $plugin_slug,
 							'from'   => 'press-this',
-						), self_admin_url( 'update.php' )
-					), 'install-plugin_' . $plugin_slug
+						),
+						self_admin_url( 'update.php' )
+					),
+					'install-plugin_' . $plugin_slug
 				);
 				$action = sprintf(
 					'<a href="%1$s" class="install-now" data-slug="%2$s" data-name="%2$s" aria-label="%3$s">%3$s</a>',
diff --git a/wp-admin/privacy.php b/wp-admin/privacy.php
index c64f7c53fb..8fec1785de 100644
--- a/wp-admin/privacy.php
+++ b/wp-admin/privacy.php
@@ -58,7 +58,7 @@ if ( ! empty( $action ) ) {
 		}
 
 		$privacy_policy_page_content = WP_Privacy_Policy_Content::get_default_content();
-		$privacy_policy_page_id = wp_insert_post(
+		$privacy_policy_page_id      = wp_insert_post(
 			array(
 				'post_title'   => __( 'Privacy Policy' ),
 				'post_status'  => 'draft',
@@ -195,16 +195,19 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 			</th>
 			<td>
 				<?php
-				$has_pages = (bool) get_posts( array(
-					'post_type' => 'page',
-					'posts_per_page' => 1,
-					'post_status' => array(
-						'publish',
-						'draft',
-					),
-				) );
+				$has_pages = (bool) get_posts(
+					array(
+						'post_type'      => 'page',
+						'posts_per_page' => 1,
+						'post_status'    => array(
+							'publish',
+							'draft',
+						),
+					)
+				);
 
-				if ( $has_pages ) : ?>
+				if ( $has_pages ) :
+					?>
 					<form method="post" action="">
 						<label for="page_for_privacy_policy">
 							<?php _e( 'Select an existing page:' ); ?>
diff --git a/wp-admin/revision.php b/wp-admin/revision.php
index b2d9a009e6..3e72c86dcd 100644
--- a/wp-admin/revision.php
+++ b/wp-admin/revision.php
@@ -63,7 +63,8 @@ switch ( $action ) {
 			array(
 				'message'  => 5,
 				'revision' => $revision->ID,
-			), get_edit_post_link( $post->ID, 'url' )
+			),
+			get_edit_post_link( $post->ID, 'url' )
 		);
 		break;
 	case 'view':
diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 2382357d84..a7f0e96d46 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -102,7 +102,7 @@ function setup_config_display_header( $body_classes = array() ) {
 	}
 
 	header( 'Content-Type: text/html; charset=utf-8' );
-?>
+	?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"<?php echo $dir_attr; ?>>
 <head>
@@ -114,7 +114,7 @@ function setup_config_display_header( $body_classes = array() ) {
 </head>
 <body class="<?php echo implode( ' ', $body_classes ); ?>">
 <p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
-<?php
+	<?php
 } // end function setup_config_display_header();
 
 $language = '';
@@ -154,7 +154,7 @@ switch ( $step ) {
 		if ( ! empty( $loaded_language ) ) {
 			$step_1 .= '&amp;language=' . $loaded_language;
 		}
-?>
+		?>
 <h1 class="screen-reader-text"><?php _e( 'Before getting started' ); ?></h1>
 <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ); ?></p>
 <ol>
@@ -165,35 +165,35 @@ switch ( $step ) {
 	<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
 </ol>
 <p>
-<?php
-	/* translators: %s: wp-config.php */
-	printf(
-		__( 'We&#8217;re going to use this information to create a %s file.' ),
-		'<code>wp-config.php</code>'
-	);
-	?>
+		<?php
+		/* translators: %s: wp-config.php */
+		printf(
+			__( 'We&#8217;re going to use this information to create a %s file.' ),
+			'<code>wp-config.php</code>'
+		);
+		?>
 	<strong>
-	<?php
+		<?php
 		/* translators: 1: wp-config-sample.php, 2: wp-config.php */
 		printf(
 			__( 'If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
 			'<code>wp-config-sample.php</code>',
 			'<code>wp-config.php</code>'
 		);
-	?>
+		?>
 	</strong>
-	<?php
-	/* translators: %s: Codex URL */
-	printf(
-		__( 'Need more help? <a href="%s">We got it</a>.' ),
-		__( 'https://codex.wordpress.org/Editing_wp-config.php' )
-	);
-?>
+		<?php
+		/* translators: %s: Codex URL */
+		printf(
+			__( 'Need more help? <a href="%s">We got it</a>.' ),
+			__( 'https://codex.wordpress.org/Editing_wp-config.php' )
+		);
+		?>
 </p>
 <p><?php _e( 'In all likelihood, these items were supplied to you by your Web Host. If you don&#8217;t have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;' ); ?></p>
 
 <p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
-<?php
+		<?php
 		break;
 
 	case 1:
@@ -201,7 +201,7 @@ switch ( $step ) {
 		$GLOBALS['wp_locale'] = new WP_Locale();
 
 		setup_config_display_header();
-	?>
+		?>
 <h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ); ?></h1>
 <form method="post" action="setup-config.php?step=2">
 	<p><?php _e( 'Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host.' ); ?></p>
@@ -237,14 +237,14 @@ switch ( $step ) {
 			<td><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></td>
 		</tr>
 	</table>
-	<?php
-	if ( isset( $_GET['noapi'] ) ) {
-?>
+		<?php
+		if ( isset( $_GET['noapi'] ) ) {
+			?>
 <input name="noapi" type="hidden" value="1" /><?php } ?>
 	<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
 	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
 </form>
-<?php
+		<?php
 		break;
 
 	case 2:
@@ -387,24 +387,24 @@ switch ( $step ) {
 
 		if ( ! is_writable( ABSPATH ) ) :
 			setup_config_display_header();
-	?>
+			?>
 	<p>
-<?php
-	/* translators: %s: wp-config.php */
-	printf( __( 'Sorry, but I can&#8217;t write the %s file.' ), '<code>wp-config.php</code>' );
-?>
+			<?php
+			/* translators: %s: wp-config.php */
+			printf( __( 'Sorry, but I can&#8217;t write the %s file.' ), '<code>wp-config.php</code>' );
+			?>
 </p>
 <p>
-<?php
-	/* translators: %s: wp-config.php */
-	printf( __( 'You can create the %s file manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
+			<?php
+			/* translators: %s: wp-config.php */
+			printf( __( 'You can create the %s file manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
 
-	$config_text = '';
+			$config_text = '';
 
-	foreach ( $config_file as $line ) {
-		$config_text .= htmlentities( $line, ENT_COMPAT, 'UTF-8' );
-	}
-?>
+			foreach ( $config_file as $line ) {
+				$config_text .= htmlentities( $line, ENT_COMPAT, 'UTF-8' );
+			}
+			?>
 </p>
 <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php echo $config_text; ?></textarea>
 <p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the installation.&#8221;' ); ?></p>
@@ -418,7 +418,7 @@ if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
 }
 })();
 </script>
-<?php
+			<?php
 	else :
 		/*
 		 * If this file doesn't exist, then we are using the wp-config-sample.php
@@ -437,12 +437,12 @@ if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
 		fclose( $handle );
 		chmod( $path_to_wp_config, 0666 );
 		setup_config_display_header();
-?>
+		?>
 <h1 class="screen-reader-text"><?php _e( 'Successful database connection' ); ?></h1>
 <p><?php _e( 'All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;' ); ?></p>
 
 <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
-<?php
+		<?php
 	endif;
 		break;
 }
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index db61f1249c..aaa5feb9e3 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -177,7 +177,7 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 	if ( $file_description != $file_show ) {
 		$description .= ' <span>(' . esc_html( $file_show ) . ')</span>';
 	}
-?>
+	?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
 
@@ -271,7 +271,7 @@ if ( $theme->errors() ) {
 if ( $error ) :
 	echo '<div class="error"><p>' . __( 'Oops, no such file exists! Double check the name and try again, merci.' ) . '</p></div>';
 else :
-?>
+	?>
 	<form name="template" id="template" action="theme-editor.php" method="post">
 		<?php wp_nonce_field( 'edit-theme_' . $stylesheet . '_' . $relative_file, 'nonce' ); ?>
 		<div>
@@ -296,7 +296,7 @@ else :
 					<p>
 						<?php
 						if ( is_writeable( $file ) ) {
-						?>
+							?>
 						<strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
 						<?php _e( 'This is a file in your current parent theme.' ); ?>
 					</p>
@@ -314,7 +314,7 @@ else :
 	</div>
 	<?php wp_print_file_editor_templates(); ?>
 	</form>
-<?php
+	<?php
 endif; // $error
 ?>
 <br class="clear" />
@@ -331,7 +331,7 @@ if ( ! in_array( 'theme_editor_notice', $dismissed_pointers, true ) ) :
 	} else {
 		$return_url = admin_url( '/' );
 	}
-?>
+	?>
 <div id="file-editor-warning" class="notification-dialog-wrap file-editor-warning hide-if-no-js hidden">
 	<div class="notification-dialog-background"></div>
 	<div class="notification-dialog">
@@ -356,7 +356,7 @@ if ( ! in_array( 'theme_editor_notice', $dismissed_pointers, true ) ) :
 		</div>
 	</div>
 </div>
-<?php
+	<?php
 endif; // editor warning notice
 
 include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index 1a250a8263..369cb87282 100644
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -41,7 +41,9 @@ foreach ( $installed_themes as $k => $v ) {
 }
 
 wp_localize_script(
-	'theme', '_wpThemeSettings', array(
+	'theme',
+	'_wpThemeSettings',
+	array(
 		'themes'          => false,
 		'settings'        => array(
 			'isInstall'  => true,
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 085058fd6a..82d95ea15d 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -133,7 +133,9 @@ if ( current_user_can( 'switch_themes' ) ) {
 wp_reset_vars( array( 'theme', 'search' ) );
 
 wp_localize_script(
-	'theme', '_wpThemeSettings', array(
+	'theme',
+	'_wpThemeSettings',
+	array(
 		'themes'   => $themes,
 		'settings' => array(
 			'canInstall'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ),
@@ -172,9 +174,9 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	<hr class="wp-header-end">
 <?php
 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) :
-?>
+	?>
 <div id="message1" class="updated notice is-dismissible"><p><?php _e( 'The active theme is broken. Reverting to the default theme.' ); ?></p></div>
-<?php
+	<?php
 elseif ( isset( $_GET['activated'] ) ) :
 	if ( isset( $_GET['previewed'] ) ) {
 		?>
@@ -184,11 +186,11 @@ elseif ( isset( $_GET['activated'] ) ) :
 																		<?php
 }
 	elseif ( isset( $_GET['deleted'] ) ) :
-	?>
+		?>
 <div id="message3" class="updated notice is-dismissible"><p><?php _e( 'Theme deleted.' ); ?></p></div>
 <?php elseif ( isset( $_GET['delete-active-child'] ) ) : ?>
 	<div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
-<?php
+	<?php
 endif;
 
 $ct = wp_get_theme();
@@ -335,16 +337,16 @@ foreach ( $themes as $theme ) :
 <?php
 // List broken themes, if any.
 if ( ! is_multisite() && current_user_can( 'edit_themes' ) && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {
-?>
+	?>
 
 <div class="broken-themes">
 <h3><?php _e( 'Broken Themes' ); ?></h3>
 <p><?php _e( 'The following themes are installed but incomplete.' ); ?></p>
 
-<?php
-$can_delete  = current_user_can( 'delete_themes' );
-$can_install = current_user_can( 'install_themes' );
-?>
+	<?php
+	$can_delete  = current_user_can( 'delete_themes' );
+	$can_install = current_user_can( 'install_themes' );
+	?>
 <table>
 	<tr>
 		<th><?php _ex( 'Name', 'theme name' ); ?></th>
@@ -367,7 +369,8 @@ $can_install = current_user_can( 'install_themes' );
 					array(
 						'action'     => 'delete',
 						'stylesheet' => urlencode( $stylesheet ),
-					), admin_url( 'themes.php' )
+					),
+					admin_url( 'themes.php' )
 				);
 				$delete_url = wp_nonce_url( $delete_url, 'delete-theme_' . $stylesheet );
 				?>
@@ -384,7 +387,8 @@ $can_install = current_user_can( 'install_themes' );
 						array(
 							'action' => 'install-theme',
 							'theme'  => urlencode( $parent_theme_name ),
-						), admin_url( 'update.php' )
+						),
+						admin_url( 'update.php' )
 					);
 					$install_url = wp_nonce_url( $install_url, 'install-theme_' . $parent_theme_name );
 					?>
@@ -398,7 +402,7 @@ $can_install = current_user_can( 'install_themes' );
 </table>
 </div>
 
-<?php
+	<?php
 }
 ?>
 </div><!-- .wrap -->
@@ -533,7 +537,9 @@ wp_print_admin_notice_templates();
 wp_print_update_row_templates();
 
 wp_localize_script(
-	'updates', '_wpUpdatesItemCounts', array(
+	'updates',
+	'_wpUpdatesItemCounts',
+	array(
 		'totals' => wp_get_update_data(),
 	)
 );
diff --git a/wp-admin/tools.php b/wp-admin/tools.php
index ddb0921767..f674ddc8c6 100644
--- a/wp-admin/tools.php
+++ b/wp-admin/tools.php
@@ -19,19 +19,21 @@ if ( $is_privacy_guide ) {
 
 } else {
 
-	$title = __('Tools');
+	$title = __( 'Tools' );
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'converter',
-		'title'   => __('Categories and Tags Converter'),
-		'content' => '<p>' . __('Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierarchy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content.' ) . '</p>' .
-		'<p>' . __( 'The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, the Activate Plugin &amp; Run Importer link will take you to a screen where you can choose to convert tags into categories or vice versa.' ) . '</p>',
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'converter',
+			'title'   => __( 'Categories and Tags Converter' ),
+			'content' => '<p>' . __( 'Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierarchy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content.' ) . '</p>' .
+			'<p>' . __( 'The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, the Activate Plugin &amp; Run Importer link will take you to a screen where you can choose to convert tags into categories or vice versa.' ) . '</p>',
+		)
+	);
 
 	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __('For more information:') . '</strong></p>' .
-		'<p>' . __('<a href="https://codex.wordpress.org/Tools_Screen">Documentation on Tools</a>') . '</p>' .
-		'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+		'<p>' . __( '<a href="https://codex.wordpress.org/Tools_Screen">Documentation on Tools</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 	);
 }
 
@@ -52,14 +54,15 @@ if ( $is_privacy_guide ) {
 } else {
 
 	if ( current_user_can( 'import' ) ) :
-	$cats = get_taxonomy('category');
-	$tags = get_taxonomy('post_tag');
-	if ( current_user_can($cats->cap->manage_terms) || current_user_can($tags->cap->manage_terms) ) : ?>
+		$cats = get_taxonomy( 'category' );
+		$tags = get_taxonomy( 'post_tag' );
+		if ( current_user_can( $cats->cap->manage_terms ) || current_user_can( $tags->cap->manage_terms ) ) :
+			?>
 	<div class="card">
-		<h2 class="title"><?php _e( 'Categories and Tags Converter' ) ?></h2>
-		<p><?php printf( __('If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.'), 'import.php' ); ?></p>
+		<h2 class="title"><?php _e( 'Categories and Tags Converter' ); ?></h2>
+		<p><?php printf( __( 'If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.' ), 'import.php' ); ?></p>
 	</div>
-	<?php
+			<?php
 	endif;
 	endif;
 
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 566301638c..abc4f8418f 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -136,7 +136,7 @@ function dismissed_updates() {
 
 		$show_text = esc_js( __( 'Show hidden updates' ) );
 		$hide_text = esc_js( __( 'Hide hidden updates' ) );
-	?>
+		?>
 	<script type="text/javascript">
 		jQuery(function( $ ) {
 			$( 'dismissed-updates' ).show();
@@ -144,14 +144,14 @@ function dismissed_updates() {
 			$( '#show-dismissed' ).click( function() { $( '#dismissed-updates' ).toggle( 'fast' ); } );
 		});
 	</script>
-	<?php
+		<?php
 		echo '<p class="hide-if-no-js"><button type="button" class="button" id="show-dismissed" aria-expanded="false">' . __( 'Show hidden updates' ) . '</button></p>';
 		echo '<ul id="dismissed-updates" class="core-updates dismissed">';
-	foreach ( (array) $dismissed as $update ) {
-		echo '<li>';
-		list_core_update( $update );
-		echo '</li>';
-	}
+		foreach ( (array) $dismissed as $update ) {
+			echo '<li>';
+			list_core_update( $update );
+			echo '</li>';
+		}
 		echo '</ul>';
 	}
 }
@@ -249,7 +249,7 @@ function list_plugin_updates() {
 <h2><?php _e( 'Plugins' ); ?></h2>
 <p><?php _e( 'The following plugins have new versions available. Check the ones you want to update and then click &#8220;Update Plugins&#8221;.' ); ?></p>
 <form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-plugins" class="upgrade">
-<?php wp_nonce_field( 'upgrade-core' ); ?>
+	<?php wp_nonce_field( 'upgrade-core' ); ?>
 <p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e( 'Update Plugins' ); ?>" name="upgrade" /></p>
 <table class="widefat updates-table" id="update-plugins-table">
 	<thead>
@@ -260,52 +260,52 @@ function list_plugin_updates() {
 	</thead>
 
 	<tbody class="plugins">
-<?php
-foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
-	$plugin_data = (object) _get_plugin_data_markup_translate( $plugin_file, (array) $plugin_data, false, true );
+	<?php
+	foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
+		$plugin_data = (object) _get_plugin_data_markup_translate( $plugin_file, (array) $plugin_data, false, true );
 
-	$icon            = '<span class="dashicons dashicons-admin-plugins"></span>';
-	$preferred_icons = array( 'svg', '2x', '1x', 'default' );
-	foreach ( $preferred_icons as $preferred_icon ) {
-		if ( ! empty( $plugin_data->update->icons[ $preferred_icon ] ) ) {
-			$icon = '<img src="' . esc_url( $plugin_data->update->icons[ $preferred_icon ] ) . '" alt="" />';
-			break;
+		$icon            = '<span class="dashicons dashicons-admin-plugins"></span>';
+		$preferred_icons = array( 'svg', '2x', '1x', 'default' );
+		foreach ( $preferred_icons as $preferred_icon ) {
+			if ( ! empty( $plugin_data->update->icons[ $preferred_icon ] ) ) {
+				$icon = '<img src="' . esc_url( $plugin_data->update->icons[ $preferred_icon ] ) . '" alt="" />';
+				break;
+			}
 		}
-	}
 
-	// Get plugin compat for running version of WordPress.
-	if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $cur_wp_version, '>=' ) ) {
-		$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $cur_wp_version );
-	} else {
-		$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $cur_wp_version );
-	}
-	// Get plugin compat for updated version of WordPress.
-	if ( $core_update_version ) {
-		if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $core_update_version, '>=' ) ) {
-			$compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $core_update_version );
+		// Get plugin compat for running version of WordPress.
+		if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $cur_wp_version, '>=' ) ) {
+			$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $cur_wp_version );
 		} else {
-			$compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $core_update_version );
+			$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $cur_wp_version );
+		}
+		// Get plugin compat for updated version of WordPress.
+		if ( $core_update_version ) {
+			if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $core_update_version, '>=' ) ) {
+				$compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $core_update_version );
+			} else {
+				$compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $core_update_version );
+			}
+		}
+		// Get the upgrade notice for the new plugin version.
+		if ( isset( $plugin_data->update->upgrade_notice ) ) {
+			$upgrade_notice = '<br />' . strip_tags( $plugin_data->update->upgrade_notice );
+		} else {
+			$upgrade_notice = '';
 		}
-	}
-	// Get the upgrade notice for the new plugin version.
-	if ( isset( $plugin_data->update->upgrade_notice ) ) {
-		$upgrade_notice = '<br />' . strip_tags( $plugin_data->update->upgrade_notice );
-	} else {
-		$upgrade_notice = '';
-	}
 
-	$details_url = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&section=changelog&TB_iframe=true&width=640&height=662' );
-	$details     = sprintf(
-		'<a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
-		esc_url( $details_url ),
-		/* translators: 1: plugin name, 2: version number */
-		esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_data->Name, $plugin_data->update->new_version ) ),
-		/* translators: %s: plugin version */
-		sprintf( __( 'View version %s details.' ), $plugin_data->update->new_version )
-	);
+		$details_url = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&section=changelog&TB_iframe=true&width=640&height=662' );
+		$details     = sprintf(
+			'<a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
+			esc_url( $details_url ),
+			/* translators: 1: plugin name, 2: version number */
+			esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_data->Name, $plugin_data->update->new_version ) ),
+			/* translators: %s: plugin version */
+			sprintf( __( 'View version %s details.' ), $plugin_data->update->new_version )
+		);
 
-	$checkbox_id = 'checkbox_' . md5( $plugin_data->Name );
-	?>
+		$checkbox_id = 'checkbox_' . md5( $plugin_data->Name );
+		?>
 	<tr>
 		<td class="check-column">
 			<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
@@ -320,7 +320,7 @@ foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
 			</label>
 		</td>
 		<td class="plugin-title"><p>
-			<?php echo $icon; ?>
+				<?php echo $icon; ?>
 			<strong><?php echo $plugin_data->Name; ?></strong>
 			<?php
 			/* translators: 1: plugin version, 2: new version */
@@ -329,13 +329,13 @@ foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
 				$plugin_data->Version,
 				$plugin_data->update->new_version
 			);
-			echo ' ' . $details . $compat . $upgrade_notice;
-		?>
+				echo ' ' . $details . $compat . $upgrade_notice;
+			?>
 		</p></td>
 	</tr>
-		<?php
-}
-?>
+			<?php
+	}
+	?>
 	</tbody>
 
 	<tfoot>
@@ -347,7 +347,7 @@ foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
 </table>
 <p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e( 'Update Plugins' ); ?>" name="upgrade" /></p>
 </form>
-<?php
+	<?php
 }
 
 /**
@@ -362,12 +362,12 @@ function list_theme_updates() {
 	}
 
 	$form_action = 'update-core.php?action=do-theme-upgrade';
-?>
+	?>
 <h2><?php _e( 'Themes' ); ?></h2>
 <p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click &#8220;Update Themes&#8221;.' ); ?></p>
 <p><?php printf( __( '<strong>Please Note:</strong> Any customizations you have made to theme files will be lost. Please consider using <a href="%s">child themes</a> for modifications.' ), __( 'https://codex.wordpress.org/Child_Themes' ) ); ?></p>
 <form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-themes" class="upgrade">
-<?php wp_nonce_field( 'upgrade-core' ); ?>
+	<?php wp_nonce_field( 'upgrade-core' ); ?>
 <p><input id="upgrade-themes" class="button" type="submit" value="<?php esc_attr_e( 'Update Themes' ); ?>" name="upgrade" /></p>
 <table class="widefat updates-table" id="update-themes-table">
 	<thead>
@@ -378,10 +378,10 @@ function list_theme_updates() {
 	</thead>
 
 	<tbody class="plugins">
-<?php
-foreach ( $themes as $stylesheet => $theme ) {
-	$checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
-	?>
+	<?php
+	foreach ( $themes as $stylesheet => $theme ) {
+		$checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
+		?>
 	<tr>
 		<td class="check-column">
 			<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $stylesheet ); ?>" />
@@ -405,12 +405,12 @@ foreach ( $themes as $stylesheet => $theme ) {
 				$theme->display( 'Version' ),
 				$theme->update['new_version']
 			);
-		?>
+			?>
 		</p></td>
 	</tr>
-		<?php
-}
-?>
+			<?php
+	}
+	?>
 	</tbody>
 
 	<tfoot>
@@ -422,7 +422,7 @@ foreach ( $themes as $stylesheet => $theme ) {
 </table>
 <p><input id="upgrade-themes-2" class="button" type="submit" value="<?php esc_attr_e( 'Update Themes' ); ?>" name="upgrade" /></p>
 </form>
-<?php
+	<?php
 }
 
 /**
@@ -481,52 +481,53 @@ function do_core_upgrade( $reinstall = false ) {
 	// that it's safe to do so. This only happens when there are no new files to create.
 	$allow_relaxed_file_ownership = ! $reinstall && isset( $update->new_files ) && ! $update->new_files;
 
-?>
+	?>
 	<div class="wrap">
 	<h1><?php _e( 'Update WordPress' ); ?></h1>
-<?php
+	<?php
 
-if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
-	echo '</div>';
-	return;
-}
-
-if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
-	// Failed to connect, Error and request again
-	request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );
-	echo '</div>';
-	return;
-}
-
-if ( $wp_filesystem->errors->has_errors() ) {
-	foreach ( $wp_filesystem->errors->get_error_messages() as $message ) {
-		show_message( $message );
+	if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
+		echo '</div>';
+		return;
 	}
-	echo '</div>';
-	return;
-}
 
-if ( $reinstall ) {
-	$update->response = 'reinstall';
-}
+	if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
+		// Failed to connect, Error and request again
+		request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );
+		echo '</div>';
+		return;
+	}
+
+	if ( $wp_filesystem->errors->has_errors() ) {
+		foreach ( $wp_filesystem->errors->get_error_messages() as $message ) {
+			show_message( $message );
+		}
+		echo '</div>';
+		return;
+	}
+
+	if ( $reinstall ) {
+		$update->response = 'reinstall';
+	}
 
 	add_filter( 'update_feedback', 'show_message' );
 
 	$upgrader = new Core_Upgrader();
 	$result   = $upgrader->upgrade(
-		$update, array(
+		$update,
+		array(
 			'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,
 		)
 	);
 
-if ( is_wp_error( $result ) ) {
-	show_message( $result );
-	if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() ) {
-		show_message( __( 'Installation Failed' ) );
+	if ( is_wp_error( $result ) ) {
+		show_message( $result );
+		if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() ) {
+			show_message( __( 'Installation Failed' ) );
+		}
+		echo '</div>';
+		return;
 	}
-	echo '</div>';
-	return;
-}
 
 	show_message( __( 'WordPress updated successfully' ) );
 	show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
@@ -668,7 +669,9 @@ if ( 'upgrade-core' == $action ) {
 	echo '</div>';
 
 	wp_localize_script(
-		'updates', '_wpUpdatesItemCounts', array(
+		'updates',
+		'_wpUpdatesItemCounts',
+		array(
 			'totals' => wp_get_update_data(),
 		)
 	);
@@ -702,7 +705,9 @@ if ( 'upgrade-core' == $action ) {
 	}
 
 	wp_localize_script(
-		'updates', '_wpUpdatesItemCounts', array(
+		'updates',
+		'_wpUpdatesItemCounts',
+		array(
 			'totals' => wp_get_update_data(),
 		)
 	);
@@ -738,7 +743,9 @@ if ( 'upgrade-core' == $action ) {
 	echo '</div>';
 
 	wp_localize_script(
-		'updates', '_wpUpdatesItemCounts', array(
+		'updates',
+		'_wpUpdatesItemCounts',
+		array(
 			'totals' => wp_get_update_data(),
 		)
 	);
@@ -776,7 +783,9 @@ if ( 'upgrade-core' == $action ) {
 	<?php
 
 	wp_localize_script(
-		'updates', '_wpUpdatesItemCounts', array(
+		'updates',
+		'_wpUpdatesItemCounts',
+		array(
 			'totals' => wp_get_update_data(),
 		)
 	);
@@ -803,7 +812,9 @@ if ( 'upgrade-core' == $action ) {
 	$result   = $upgrader->bulk_upgrade();
 
 	wp_localize_script(
-		'updates', '_wpUpdatesItemCounts', array(
+		'updates',
+		'_wpUpdatesItemCounts',
+		array(
 			'totals' => wp_get_update_data(),
 		)
 	);
diff --git a/wp-admin/update.php b/wp-admin/update.php
index 5b07beb710..556ff6e15d 100644
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -106,7 +106,8 @@ if ( isset( $_GET['action'] ) ) {
 
 		check_admin_referer( 'install-plugin_' . $plugin );
 		$api = plugins_api(
-			'plugin_information', array(
+			'plugin_information',
+			array(
 				'slug'   => $plugin,
 				'fields' => array(
 					'sections' => false,
@@ -225,7 +226,8 @@ if ( isset( $_GET['action'] ) ) {
 
 		check_admin_referer( 'install-theme_' . $theme );
 		$api = themes_api(
-			'theme_information', array(
+			'theme_information',
+			array(
 				'slug'   => $theme,
 				'fields' => array(
 					'sections' => false,
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index bd9419d506..9d701781c4 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -78,7 +78,7 @@ if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
 <p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p>
 <p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
 
-<?php
+	<?php
 elseif ( ! $php_compat || ! $mysql_compat ) :
 	if ( ! $mysql_compat && ! $php_compat ) {
 		printf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
@@ -87,8 +87,8 @@ elseif ( ! $php_compat || ! $mysql_compat ) :
 	} elseif ( ! $mysql_compat ) {
 		printf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
 	}
-?>
-<?php
+	?>
+	<?php
 else :
 	switch ( $step ) :
 		case 0:
@@ -97,12 +97,12 @@ else :
 				$goback = esc_url_raw( $goback );
 				$goback = urlencode( $goback );
 			}
-	?>
+			?>
 	<h1><?php _e( 'Database Update Required' ); ?></h1>
 <p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
 <p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
 <p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
-<?php
+			<?php
 			break;
 		case 1:
 			wp_upgrade();
@@ -110,20 +110,20 @@ else :
 			$backto = ! empty( $_GET['backto'] ) ? wp_unslash( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
 			$backto = esc_url( $backto );
 			$backto = wp_validate_redirect( $backto, __get_option( 'home' ) . '/' );
-	?>
+			?>
 	<h1><?php _e( 'Update Complete' ); ?></h1>
 	<p><?php _e( 'Your WordPress database has been successfully updated!' ); ?></p>
 	<p class="step"><a class="button button-large" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
 
 <!--
 <pre>
-<?php printf( __( '%s queries' ), $wpdb->num_queries ); ?>
+			<?php printf( __( '%s queries' ), $wpdb->num_queries ); ?>
 
-<?php printf( __( '%s seconds' ), timer_stop( 0 ) ); ?>
+			<?php printf( __( '%s seconds' ), timer_stop( 0 ) ); ?>
 </pre>
 -->
 
-<?php
+			<?php
 			break;
 endswitch;
 endif;
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index f38348004b..3afd24f272 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -40,7 +40,9 @@ if ( 'grid' === $mode ) {
 	}
 
 	wp_localize_script(
-		'media-grid', '_wpMediaGridSettings', array(
+		'media-grid',
+		'_wpMediaGridSettings',
+		array(
 			'adminUrl'  => parse_url( self_admin_url(), PHP_URL_PATH ),
 			'queryVars' => (object) $vars,
 		)
@@ -84,7 +86,7 @@ if ( 'grid' === $mode ) {
 
 		<?php
 		if ( current_user_can( 'upload_files' ) ) {
-		?>
+			?>
 			<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action aria-button-if-js"><?php echo esc_html_x( 'Add New', 'file' ); ?></a>
 								<?php
 		}
@@ -160,7 +162,8 @@ if ( $doaction ) {
 				array(
 					'trashed' => count( $post_ids ),
 					'ids'     => join( ',', $post_ids ),
-				), $location
+				),
+				$location
 			);
 			break;
 		case 'untrash':
@@ -263,7 +266,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 <?php
 if ( current_user_can( 'upload_files' ) ) {
-?>
+	?>
 	<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a>
 						<?php
 }
@@ -351,7 +354,7 @@ if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
 }
 
 if ( ! empty( $message ) ) {
-?>
+	?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></div>
 <?php } ?>
 
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index b1547886d5..3a469a3db0 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -184,52 +184,52 @@ switch ( $action ) {
 		$sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
 
 		include( ABSPATH . 'wp-admin/admin-header.php' );
-	?>
+		?>
 
-	<?php if ( ! IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?>
+		<?php if ( ! IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?>
 	<div class="notice notice-info"><p><strong><?php _e( 'Important:' ); ?></strong> <?php _e( 'This user has super admin privileges.' ); ?></p></div>
 <?php } ?>
-<?php if ( isset( $_GET['updated'] ) ) : ?>
+		<?php if ( isset( $_GET['updated'] ) ) : ?>
 <div id="message" class="updated notice is-dismissible">
-	<?php if ( IS_PROFILE_PAGE ) : ?>
+			<?php if ( IS_PROFILE_PAGE ) : ?>
 	<p><strong><?php _e( 'Profile updated.' ); ?></strong></p>
 	<?php else : ?>
 	<p><strong><?php _e( 'User updated.' ); ?></strong></p>
 	<?php endif; ?>
-	<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
+			<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
 	<p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '&larr; Back to Users' ); ?></a></p>
 	<?php endif; ?>
 </div>
-<?php endif; ?>
-<?php if ( isset( $_GET['error'] ) ) : ?>
+		<?php endif; ?>
+		<?php if ( isset( $_GET['error'] ) ) : ?>
 <div class="notice notice-error">
-	<?php if ( 'new-email' == $_GET['error'] ) : ?>
+			<?php if ( 'new-email' == $_GET['error'] ) : ?>
 	<p><?php _e( 'Error while saving the new email address. Please try again.' ); ?></p>
 	<?php endif; ?>
 </div>
-<?php endif; ?>
-<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
+		<?php endif; ?>
+		<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
 <div class="error"><p><?php echo implode( "</p>\n<p>", $errors->get_error_messages() ); ?></p></div>
-<?php endif; ?>
+		<?php endif; ?>
 
 <div class="wrap" id="profile-page">
 <h1 class="wp-heading-inline">
-<?php
-echo esc_html( $title );
-?>
+		<?php
+		echo esc_html( $title );
+		?>
 </h1>
 
-<?php
-if ( ! IS_PROFILE_PAGE ) {
-	if ( current_user_can( 'create_users' ) ) {
-	?>
+		<?php
+		if ( ! IS_PROFILE_PAGE ) {
+			if ( current_user_can( 'create_users' ) ) {
+				?>
 		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
 	<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
 		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
-	<?php
+				<?php
 }
-}
-?>
+		}
+		?>
 
 <hr class="wp-header-end">
 
@@ -241,12 +241,12 @@ if ( ! IS_PROFILE_PAGE ) {
 											 * @since 3.0.0
 											 */
 											do_action( 'user_edit_form_tag' );
-	?>
+											?>
 	>
-	<?php wp_nonce_field( 'update-user_' . $user_id ); ?>
-<?php if ( $wp_http_referer ) : ?>
+		<?php wp_nonce_field( 'update-user_' . $user_id ); ?>
+		<?php if ( $wp_http_referer ) : ?>
 	<input type="hidden" name="wp_http_referer" value="<?php echo esc_url( $wp_http_referer ); ?>" />
-<?php endif; ?>
+		<?php endif; ?>
 <p>
 <input type="hidden" name="from" value="profile" />
 <input type="hidden" name="checkuser_id" value="<?php echo get_current_user_id(); ?>" />
@@ -255,25 +255,25 @@ if ( ! IS_PROFILE_PAGE ) {
 <h2><?php _e( 'Personal Options' ); ?></h2>
 
 <table class="form-table">
-<?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
+		<?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
 	<tr class="user-rich-editing-wrap">
 		<th scope="row"><?php _e( 'Visual Editor' ); ?></th>
 		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
 	</tr>
-<?php endif; ?>
-<?php
-$show_syntax_highlighting_preference = (
-	// For Custom HTML widget and Additional CSS in Customizer.
-	user_can( $profileuser, 'edit_theme_options' )
-	||
-	// Edit plugins.
-	user_can( $profileuser, 'edit_plugins' )
-	||
-	// Edit themes.
-	user_can( $profileuser, 'edit_themes' )
-	);
-	?>
-	<?php if ( $show_syntax_highlighting_preference ) : ?>
+		<?php endif; ?>
+		<?php
+		$show_syntax_highlighting_preference = (
+		// For Custom HTML widget and Additional CSS in Customizer.
+		user_can( $profileuser, 'edit_theme_options' )
+		||
+		// Edit plugins.
+		user_can( $profileuser, 'edit_plugins' )
+		||
+		// Edit themes.
+		user_can( $profileuser, 'edit_themes' )
+		);
+		?>
+		<?php if ( $show_syntax_highlighting_preference ) : ?>
 	<tr class="user-syntax-highlighting-wrap">
 		<th scope="row"><?php _e( 'Syntax Highlighting' ); ?></th>
 		<td>
@@ -281,30 +281,30 @@ $show_syntax_highlighting_preference = (
 		</td>
 	</tr>
 <?php endif; ?>
-<?php if ( count( $_wp_admin_css_colors ) > 1 && has_action( 'admin_color_scheme_picker' ) ) : ?>
+		<?php if ( count( $_wp_admin_css_colors ) > 1 && has_action( 'admin_color_scheme_picker' ) ) : ?>
 <tr class="user-admin-color-wrap">
 <th scope="row"><?php _e( 'Admin Color Scheme' ); ?></th>
 <td>
-<?php
-	/**
-	 * Fires in the 'Admin Color Scheme' section of the user editing screen.
-	 *
-	 * The section is only enabled if a callback is hooked to the action,
-	 * and if there is more than one defined color scheme for the admin.
-	 *
-	 * @since 3.0.0
-	 * @since 3.8.1 Added `$user_id` parameter.
-	 *
-	 * @param int $user_id The user ID.
-	 */
-	do_action( 'admin_color_scheme_picker', $user_id );
-?>
+			<?php
+			/**
+			 * Fires in the 'Admin Color Scheme' section of the user editing screen.
+			 *
+			 * The section is only enabled if a callback is hooked to the action,
+			 * and if there is more than one defined color scheme for the admin.
+			 *
+			 * @since 3.0.0
+			 * @since 3.8.1 Added `$user_id` parameter.
+			 *
+			 * @param int $user_id The user ID.
+			 */
+			do_action( 'admin_color_scheme_picker', $user_id );
+			?>
 </td>
 </tr>
-<?php
+			<?php
 endif; // $_wp_admin_css_colors
 if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) :
-?>
+	?>
 <tr class="user-comment-shortcuts-wrap">
 <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
 <td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e( 'Enable keyboard shortcuts for comment moderation.' ); ?></label> <?php _e( '<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>' ); ?></td>
@@ -315,73 +315,73 @@ if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) :
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Toolbar' ); ?></span></legend>
 <label for="admin_bar_front">
 <input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
-<?php _e( 'Show Toolbar when viewing site' ); ?></label><br />
+		<?php _e( 'Show Toolbar when viewing site' ); ?></label><br />
 </fieldset>
 </td>
 </tr>
 
-<?php
-$languages = get_available_languages();
-if ( $languages ) :
-?>
+		<?php
+		$languages = get_available_languages();
+		if ( $languages ) :
+			?>
 <tr class="user-language-wrap">
 	<th scope="row">
-		<?php /* translators: The user language selection field label */ ?>
+			<?php /* translators: The user language selection field label */ ?>
 		<label for="locale"><?php _e( 'Language' ); ?></label>
 	</th>
 	<td>
-		<?php
-		$user_locale = $profileuser->locale;
+			<?php
+				$user_locale = $profileuser->locale;
 
-		if ( 'en_US' === $user_locale ) {
-			$user_locale = '';
-		} elseif ( '' === $user_locale || ! in_array( $user_locale, $languages, true ) ) {
-			$user_locale = 'site-default';
-		}
+			if ( 'en_US' === $user_locale ) {
+				$user_locale = '';
+			} elseif ( '' === $user_locale || ! in_array( $user_locale, $languages, true ) ) {
+				$user_locale = 'site-default';
+			}
 
-		wp_dropdown_languages(
-			array(
-				'name'                        => 'locale',
-				'id'                          => 'locale',
-				'selected'                    => $user_locale,
-				'languages'                   => $languages,
-				'show_available_translations' => false,
-				'show_option_site_default'    => true,
-			)
-		);
-		?>
+			wp_dropdown_languages(
+				array(
+					'name'                        => 'locale',
+					'id'                          => 'locale',
+					'selected'                    => $user_locale,
+					'languages'                   => $languages,
+					'show_available_translations' => false,
+					'show_option_site_default'    => true,
+				)
+			);
+			?>
 	</td>
 </tr>
-<?php
+			<?php
 endif;
-?>
+		?>
 
-<?php
-/**
- * Fires at the end of the 'Personal Options' settings table on the user editing screen.
- *
- * @since 2.7.0
- *
- * @param WP_User $profileuser The current WP_User object.
- */
-do_action( 'personal_options', $profileuser );
-?>
+		<?php
+		/**
+		 * Fires at the end of the 'Personal Options' settings table on the user editing screen.
+		 *
+		 * @since 2.7.0
+		 *
+		 * @param WP_User $profileuser The current WP_User object.
+		 */
+		do_action( 'personal_options', $profileuser );
+		?>
 
 </table>
-<?php
-if ( IS_PROFILE_PAGE ) {
-	/**
-	 * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
-	 *
-	 * The action only fires if the current user is editing their own profile.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param WP_User $profileuser The current WP_User object.
-	 */
-	do_action( 'profile_personal_options', $profileuser );
-}
-?>
+		<?php
+		if ( IS_PROFILE_PAGE ) {
+			/**
+			 * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
+			 *
+			 * The action only fires if the current user is editing their own profile.
+			 *
+			 * @since 2.0.0
+			 *
+			 * @param WP_User $profileuser The current WP_User object.
+			 */
+			do_action( 'profile_personal_options', $profileuser );
+		}
+		?>
 
 <h2><?php _e( 'Name' ); ?></h2>
 
@@ -391,33 +391,33 @@ if ( IS_PROFILE_PAGE ) {
 		<td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr( $profileuser->user_login ); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e( 'Usernames cannot be changed.' ); ?></span></td>
 	</tr>
 
-<?php if ( ! IS_PROFILE_PAGE && ! is_network_admin() && current_user_can( 'promote_user', $profileuser->ID ) ) : ?>
+		<?php if ( ! IS_PROFILE_PAGE && ! is_network_admin() && current_user_can( 'promote_user', $profileuser->ID ) ) : ?>
 <tr class="user-role-wrap"><th><label for="role"><?php _e( 'Role' ); ?></label></th>
 <td><select name="role" id="role">
-<?php
-// Compare user role against currently editable roles
-$user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
-$user_role  = reset( $user_roles );
+			<?php
+			// Compare user role against currently editable roles
+			$user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
+			$user_role  = reset( $user_roles );
 
-// print the full list of roles with the primary one selected.
-wp_dropdown_roles( $user_role );
+			// print the full list of roles with the primary one selected.
+			wp_dropdown_roles( $user_role );
 
-// print the 'no role' option. Make it selected if the user has no role yet.
-if ( $user_role ) {
-	echo '<option value="">' . __( '&mdash; No role for this site &mdash;' ) . '</option>';
-} else {
-	echo '<option value="" selected="selected">' . __( '&mdash; No role for this site &mdash;' ) . '</option>';
-}
-?>
+			// print the 'no role' option. Make it selected if the user has no role yet.
+			if ( $user_role ) {
+				echo '<option value="">' . __( '&mdash; No role for this site &mdash;' ) . '</option>';
+			} else {
+				echo '<option value="" selected="selected">' . __( '&mdash; No role for this site &mdash;' ) . '</option>';
+			}
+			?>
 </select></td></tr>
-<?php
+			<?php
 endif; //!IS_PROFILE_PAGE
 
 if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && ! isset( $super_admins ) ) {
-?>
+	?>
 <tr class="user-super-admin-wrap"><th><?php _e( 'Super Admin' ); ?></th>
 <td>
-<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
+	<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
 <?php else : ?>
 <p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
@@ -470,9 +470,9 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 			$public_display = array_unique( $public_display );
 
 		foreach ( $public_display as $id => $item ) {
-		?>
+			?>
 		<option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
-		<?php
+			<?php
 		}
 		?>
 		</select>
@@ -488,30 +488,30 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 		<td><input type="email" name="email" id="email" aria-describedby="email-description" value="<?php echo esc_attr( $profileuser->user_email ); ?>" class="regular-text ltr" />
 		<?php
 		if ( $profileuser->ID == $current_user->ID ) :
-		?>
+			?>
 		<p class="description" id="email-description">
 			<?php _e( 'If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
 		</p>
-		<?php
+			<?php
 		endif;
 
 		$new_email = get_user_meta( $current_user->ID, '_new_email', true );
 		if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) :
-		?>
+			?>
 		<div class="updated inline">
 		<p>
-		<?php
-		printf(
-			/* translators: %s: new email */
-			__( 'There is a pending change of your email to %s.' ),
-			'<code>' . esc_html( $new_email['newemail'] ) . '</code>'
-		);
-		printf(
-			' <a href="%1$s">%2$s</a>',
-			esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
-			__( 'Cancel' )
-		);
-		?>
+			<?php
+			printf(
+				/* translators: %s: new email */
+				__( 'There is a pending change of your email to %s.' ),
+				'<code>' . esc_html( $new_email['newemail'] ) . '</code>'
+			);
+			printf(
+				' <a href="%1$s">%2$s</a>',
+				esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
+				__( 'Cancel' )
+			);
+			?>
 		</p>
 		</div>
 		<?php endif; ?>
@@ -523,30 +523,30 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 	<td><input type="url" name="url" id="url" value="<?php echo esc_attr( $profileuser->user_url ); ?>" class="regular-text code" /></td>
 	</tr>
 
-	<?php
-	foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
-	?>
+		<?php
+		foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
+			?>
 	<tr class="user-<?php echo $name; ?>-wrap">
 <th><label for="<?php echo $name; ?>">
-	<?php
-	/**
-	 * Filters a user contactmethod label.
-	 *
-	 * The dynamic portion of the filter hook, `$name`, refers to
-	 * each of the keys in the contactmethods array.
-	 *
-	 * @since 2.9.0
-	 *
-	 * @param string $desc The translatable label for the contactmethod.
-	 */
-	echo apply_filters( "user_{$name}_label", $desc );
-	?>
+			<?php
+			/**
+			 * Filters a user contactmethod label.
+			 *
+			 * The dynamic portion of the filter hook, `$name`, refers to
+			 * each of the keys in the contactmethods array.
+			 *
+			 * @since 2.9.0
+			 *
+			 * @param string $desc The translatable label for the contactmethod.
+			 */
+			echo apply_filters( "user_{$name}_label", $desc );
+			?>
 	</label></th>
 	<td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr( $profileuser->$name ); ?>" class="regular-text" /></td>
 	</tr>
-	<?php
-	}
-	?>
+			<?php
+		}
+		?>
 	</table>
 
 	<h2><?php IS_PROFILE_PAGE ? _e( 'About Yourself' ) : _e( 'About the user' ); ?></h2>
@@ -558,22 +558,22 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 	<p class="description"><?php _e( 'Share a little biographical information to fill out your profile. This may be shown publicly.' ); ?></p></td>
 </tr>
 
-<?php if ( get_option( 'show_avatars' ) ) : ?>
+		<?php if ( get_option( 'show_avatars' ) ) : ?>
 <tr class="user-profile-picture">
 	<th><?php _e( 'Profile Picture' ); ?></th>
 	<td>
-		<?php echo get_avatar( $user_id ); ?>
+			<?php echo get_avatar( $user_id ); ?>
 		<p class="description">
-		<?php
-		if ( IS_PROFILE_PAGE ) {
-			/* translators: %s: Gravatar URL */
-			$description = sprintf(
-				__( 'You can change your profile picture on <a href="%s">Gravatar</a>.' ),
-				__( 'https://en.gravatar.com/' )
-			);
-		} else {
-			$description = '';
-		}
+			<?php
+			if ( IS_PROFILE_PAGE ) {
+				/* translators: %s: Gravatar URL */
+				$description = sprintf(
+					__( 'You can change your profile picture on <a href="%s">Gravatar</a>.' ),
+					__( 'https://en.gravatar.com/' )
+				);
+			} else {
+				$description = '';
+			}
 
 			/**
 			 * Filters the user profile picture description displayed under the Gravatar.
@@ -585,25 +585,25 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 			 * @param WP_User $profileuser The current WP_User object.
 			 */
 			echo apply_filters( 'user_profile_picture_description', $description, $profileuser );
-		?>
+			?>
 		</p>
 	</td>
 </tr>
 <?php endif; ?>
 
-	<?php
-	/**
-	 * Filters the display of the password fields.
-	 *
-	 * @since 1.5.1
-	 * @since 2.8.0 Added the `$profileuser` parameter.
-	 * @since 4.4.0 Now evaluated only in user-edit.php.
-	 *
-	 * @param bool    $show        Whether to show the password fields. Default true.
-	 * @param WP_User $profileuser User object for the current user to edit.
-	 */
-	if ( $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ) ) :
-	?>
+		<?php
+		/**
+		 * Filters the display of the password fields.
+		 *
+		 * @since 1.5.1
+		 * @since 2.8.0 Added the `$profileuser` parameter.
+		 * @since 4.4.0 Now evaluated only in user-edit.php.
+		 *
+		 * @param bool    $show        Whether to show the password fields. Default true.
+		 * @param WP_User $profileuser User object for the current user to edit.
+		 */
+		if ( $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ) ) :
+			?>
 	</table>
 
 	<h2><?php _e( 'Account Management' ); ?></h2>
@@ -644,11 +644,11 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 		</label>
 	</td>
 </tr>
-<?php endif; ?>
+	<?php endif; ?>
 
-<?php
-if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) :
-?>
+		<?php
+		if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) :
+			?>
 	<tr class="user-sessions-wrap hide-if-no-js">
 		<th><?php _e( 'Sessions' ); ?></th>
 		<td aria-live="assertive">
@@ -685,77 +685,77 @@ if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) :
 
 	</table>
 
-	<?php
-	if ( IS_PROFILE_PAGE ) {
-		/**
-		 * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
-		 *
-		 * The action only fires if the current user is editing their own profile.
-		 *
-		 * @since 2.0.0
-		 *
-		 * @param WP_User $profileuser The current WP_User object.
-		 */
-		do_action( 'show_user_profile', $profileuser );
-	} else {
-		/**
-		 * Fires after the 'About the User' settings table on the 'Edit User' screen.
-		 *
-		 * @since 2.0.0
-		 *
-		 * @param WP_User $profileuser The current WP_User object.
-		 */
-		do_action( 'edit_user_profile', $profileuser );
-	}
-	?>
+		<?php
+		if ( IS_PROFILE_PAGE ) {
+			/**
+			 * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
+			 *
+			 * The action only fires if the current user is editing their own profile.
+			 *
+			 * @since 2.0.0
+			 *
+			 * @param WP_User $profileuser The current WP_User object.
+			 */
+			do_action( 'show_user_profile', $profileuser );
+		} else {
+			/**
+			 * Fires after the 'About the User' settings table on the 'Edit User' screen.
+			 *
+			 * @since 2.0.0
+			 *
+			 * @param WP_User $profileuser The current WP_User object.
+			 */
+			do_action( 'edit_user_profile', $profileuser );
+		}
+		?>
 
-	<?php
-	/**
-	 * Filters whether to display additional capabilities for the user.
-	 *
-	 * The 'Additional Capabilities' section will only be enabled if
-	 * the number of the user's capabilities exceeds their number of
-	 * roles.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param bool    $enable      Whether to display the capabilities. Default true.
-	 * @param WP_User $profileuser The current WP_User object.
-	 */
-	if ( count( $profileuser->caps ) > count( $profileuser->roles )
-	&& apply_filters( 'additional_capabilities_display', true, $profileuser )
-	) :
-	?>
+		<?php
+		/**
+		 * Filters whether to display additional capabilities for the user.
+		 *
+		 * The 'Additional Capabilities' section will only be enabled if
+		 * the number of the user's capabilities exceeds their number of
+		 * roles.
+		 *
+		 * @since 2.8.0
+		 *
+		 * @param bool    $enable      Whether to display the capabilities. Default true.
+		 * @param WP_User $profileuser The current WP_User object.
+		 */
+		if ( count( $profileuser->caps ) > count( $profileuser->roles )
+		&& apply_filters( 'additional_capabilities_display', true, $profileuser )
+		) :
+			?>
 	<h2><?php _e( 'Additional Capabilities' ); ?></h2>
 <table class="form-table">
 <tr class="user-capabilities-wrap">
 	<th scope="row"><?php _e( 'Capabilities' ); ?></th>
 	<td>
-<?php
-	$output = '';
-foreach ( $profileuser->caps as $cap => $value ) {
-	if ( ! $wp_roles->is_role( $cap ) ) {
-		if ( '' != $output ) {
-			$output .= ', ';
-		}
-		$output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
-	}
-}
-	echo $output;
-?>
+			<?php
+			$output = '';
+			foreach ( $profileuser->caps as $cap => $value ) {
+				if ( ! $wp_roles->is_role( $cap ) ) {
+					if ( '' != $output ) {
+						$output .= ', ';
+					}
+					$output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
+				}
+			}
+			echo $output;
+			?>
 	</td>
 </tr>
 </table>
-<?php endif; ?>
+	<?php endif; ?>
 
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr( $user_id ); ?>" />
 
-<?php submit_button( IS_PROFILE_PAGE ? __( 'Update Profile' ) : __( 'Update User' ) ); ?>
+		<?php submit_button( IS_PROFILE_PAGE ? __( 'Update Profile' ) : __( 'Update User' ) ); ?>
 
 </form>
 </div>
-<?php
+		<?php
 		break;
 }
 ?>
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 91ba0ace58..48387b0373 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -79,7 +79,8 @@ if ( isset( $_REQUEST['action'] ) && 'adduser' == $_REQUEST['action'] ) {
 					array(
 						'update'  => 'addnoconfirmation',
 						'user_id' => $user_id,
-					), 'user-new.php'
+					),
+					'user-new.php'
 				);
 			} else {
 				$redirect = add_query_arg( array( 'update' => 'could_not_add' ), 'user-new.php' );
@@ -87,7 +88,8 @@ if ( isset( $_REQUEST['action'] ) && 'adduser' == $_REQUEST['action'] ) {
 		} else {
 			$newuser_key = wp_generate_password( 20, false );
 			add_option(
-				'new_user_' . $newuser_key, array(
+				'new_user_' . $newuser_key,
+				array(
 					'user_id' => $user_id,
 					'email'   => $user_details->user_email,
 					'role'    => $_REQUEST['role'],
@@ -176,7 +178,9 @@ Please click the following link to confirm the invite:
 				add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email
 			}
 			wpmu_signup_user(
-				$new_user_login, $new_user_email, array(
+				$new_user_login,
+				$new_user_email,
+				array(
 					'add_to_blog' => get_current_blog_id(),
 					'new_role'    => $_REQUEST['role'],
 				)
@@ -193,7 +197,8 @@ Please click the following link to confirm the invite:
 						array(
 							'update'  => 'addnoconfirmation',
 							'user_id' => $new_user['user_id'],
-						), 'user-new.php'
+						),
+						'user-new.php'
 					);
 				}
 			} else {
@@ -343,7 +348,7 @@ if ( current_user_can( 'create_users' ) ) {
 		?>
 		</ul>
 	</div>
-<?php
+	<?php
 endif;
 
 if ( ! empty( $messages ) ) {
@@ -378,19 +383,19 @@ if ( is_multisite() && current_user_can( 'promote_users' ) ) {
 		$label = __( 'Email or Username' );
 		$type  = 'text';
 	}
-?>
+	?>
 <form method="post" name="adduser" id="adduser" class="validate" novalidate="novalidate"
-<?php
+	<?php
 	/**
 	 * Fires inside the adduser form tag.
 	 *
 	 * @since 3.0.0
 	 */
 	do_action( 'user_new_form_tag' );
-?>
+	?>
 >
 <input name="action" type="hidden" value="adduser" />
-<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>
+	<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>
 
 <table class="form-table">
 	<tr class="form-field form-required">
@@ -404,7 +409,7 @@ if ( is_multisite() && current_user_can( 'promote_users' ) ) {
 			</select>
 		</td>
 	</tr>
-<?php if ( current_user_can( 'manage_network_users' ) ) { ?>
+	<?php if ( current_user_can( 'manage_network_users' ) ) { ?>
 	<tr>
 		<th scope="row"><?php _e( 'Skip Confirmation Email' ); ?></th>
 		<td>
@@ -414,53 +419,53 @@ if ( is_multisite() && current_user_can( 'promote_users' ) ) {
 	</tr>
 <?php } ?>
 </table>
-<?php
-/**
- * Fires at the end of the new user form.
- *
- * Passes a contextual string to make both types of new user forms
- * uniquely targetable. Contexts are 'add-existing-user' (Multisite),
- * and 'add-new-user' (single site and network admin).
- *
- * @since 3.7.0
- *
- * @param string $type A contextual string specifying which type of new user form the hook follows.
- */
-do_action( 'user_new_form', 'add-existing-user' );
-?>
-<?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
+	<?php
+	/**
+	 * Fires at the end of the new user form.
+	 *
+	 * Passes a contextual string to make both types of new user forms
+	 * uniquely targetable. Contexts are 'add-existing-user' (Multisite),
+	 * and 'add-new-user' (single site and network admin).
+	 *
+	 * @since 3.7.0
+	 *
+	 * @param string $type A contextual string specifying which type of new user form the hook follows.
+	 */
+	do_action( 'user_new_form', 'add-existing-user' );
+	?>
+	<?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
 </form>
-<?php
+	<?php
 } // is_multisite()
 
 if ( current_user_can( 'create_users' ) ) {
 	if ( $do_both ) {
 		echo '<h2 id="create-new-user">' . __( 'Add New User' ) . '</h2>';
 	}
-?>
+	?>
 <p><?php _e( 'Create a brand new user and add them to this site.' ); ?></p>
 <form method="post" name="createuser" id="createuser" class="validate" novalidate="novalidate"
-<?php
+	<?php
 	/** This action is documented in wp-admin/user-new.php */
 	do_action( 'user_new_form_tag' );
-?>
+	?>
 >
 <input name="action" type="hidden" value="createuser" />
-<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ); ?>
-<?php
-// Load up the passed data, else set to a default.
-$creating = isset( $_POST['createuser'] );
+	<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ); ?>
+	<?php
+	// Load up the passed data, else set to a default.
+	$creating = isset( $_POST['createuser'] );
 
-$new_user_login             = $creating && isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : '';
-$new_user_firstname         = $creating && isset( $_POST['first_name'] ) ? wp_unslash( $_POST['first_name'] ) : '';
-$new_user_lastname          = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_POST['last_name'] ) : '';
-$new_user_email             = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : '';
-$new_user_uri               = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : '';
-$new_user_role              = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
-$new_user_send_notification = $creating && ! isset( $_POST['send_user_notification'] ) ? false : true;
-$new_user_ignore_pass       = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
+	$new_user_login             = $creating && isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : '';
+	$new_user_firstname         = $creating && isset( $_POST['first_name'] ) ? wp_unslash( $_POST['first_name'] ) : '';
+	$new_user_lastname          = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_POST['last_name'] ) : '';
+	$new_user_email             = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : '';
+	$new_user_uri               = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : '';
+	$new_user_role              = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
+	$new_user_send_notification = $creating && ! isset( $_POST['send_user_notification'] ) ? false : true;
+	$new_user_ignore_pass       = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
 
-?>
+	?>
 <table class="form-table">
 	<tr class="form-field form-required">
 		<th scope="row"><label for="user_login"><?php _e( 'Username' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
@@ -470,7 +475,7 @@ $new_user_ignore_pass       = $creating && isset( $_POST['noconfirmation'] ) ? w
 		<th scope="row"><label for="email"><?php _e( 'Email' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
 		<td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></td>
 	</tr>
-<?php if ( ! is_multisite() ) { ?>
+	<?php if ( ! is_multisite() ) { ?>
 	<tr class="form-field">
 		<th scope="row"><label for="first_name"><?php _e( 'First Name' ); ?> </label></th>
 		<td><input name="first_name" type="text" id="first_name" value="<?php echo esc_attr( $new_user_firstname ); ?>" /></td>
@@ -555,12 +560,12 @@ $new_user_ignore_pass       = $creating && isset( $_POST['noconfirmation'] ) ? w
 	<?php } ?>
 </table>
 
-<?php
-/** This action is documented in wp-admin/user-new.php */
-do_action( 'user_new_form', 'add-new-user' );
-?>
+	<?php
+	/** This action is documented in wp-admin/user-new.php */
+	do_action( 'user_new_form', 'add-new-user' );
+	?>
 
-<?php submit_button( __( 'Add New User' ), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
+	<?php submit_button( __( 'Add New User' ), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
 
 </form>
 <?php } // current_user_can('create_users') ?>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index b1ca382422..42ce41e87e 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -206,7 +206,8 @@ switch ( $wp_list_table->current_action() ) {
 			array(
 				'delete_count' => $delete_count,
 				'update'       => $update,
-			), $redirect
+			),
+			$redirect
 		);
 		wp_redirect( $redirect );
 		exit();
@@ -245,48 +246,48 @@ switch ( $wp_list_table->current_action() ) {
 		}
 
 		include( ABSPATH . 'wp-admin/admin-header.php' );
-	?>
+		?>
 	<form method="post" name="updateusers" id="updateusers">
-	<?php wp_nonce_field( 'delete-users' ); ?>
-<?php echo $referer; ?>
+		<?php wp_nonce_field( 'delete-users' ); ?>
+		<?php echo $referer; ?>
 
 <div class="wrap">
 <h1><?php _e( 'Delete Users' ); ?></h1>
-<?php if ( isset( $_REQUEST['error'] ) ) : ?>
+		<?php if ( isset( $_REQUEST['error'] ) ) : ?>
 	<div class="error">
 		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
 	</div>
-<?php endif; ?>
+		<?php endif; ?>
 
-<?php if ( 1 == count( $userids ) ) : ?>
+		<?php if ( 1 == count( $userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
-<?php else : ?>
+		<?php else : ?>
 	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
-<?php endif; ?>
+		<?php endif; ?>
 
 <ul>
-<?php
-	$go_delete = 0;
-foreach ( $userids as $id ) {
-	$user = get_userdata( $id );
-	if ( $id == $current_user->ID ) {
-		/* translators: 1: user id, 2: user login */
-		echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>' ), $id, $user->user_login ) . "</li>\n";
-	} else {
-		/* translators: 1: user id, 2: user login */
-		echo '<li><input type="hidden" name="users[]" value="' . esc_attr( $id ) . '" />' . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
-		$go_delete++;
-	}
-}
-	?>
+		<?php
+		$go_delete = 0;
+		foreach ( $userids as $id ) {
+			$user = get_userdata( $id );
+			if ( $id == $current_user->ID ) {
+				/* translators: 1: user id, 2: user login */
+				echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>' ), $id, $user->user_login ) . "</li>\n";
+			} else {
+				/* translators: 1: user id, 2: user login */
+				echo '<li><input type="hidden" name="users[]" value="' . esc_attr( $id ) . '" />' . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
+				$go_delete++;
+			}
+		}
+		?>
 	</ul>
-	<?php
-	if ( $go_delete ) :
+		<?php
+		if ( $go_delete ) :
 
-		if ( ! $users_have_content ) :
-	?>
+			if ( ! $users_have_content ) :
+				?>
 			<input type="hidden" name="delete_option" value="delete" />
-		<?php else : ?>
+			<?php else : ?>
 		<?php if ( 1 == $go_delete ) : ?>
 			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
 		<?php else : ?>
@@ -320,15 +321,15 @@ foreach ( $userids as $id ) {
 	 * @param int[]   $userids      Array of IDs for users being deleted.
 	 */
 	do_action( 'delete_user_form', $current_user, $userids );
-	?>
+?>
 	<input type="hidden" name="action" value="dodelete" />
-	<?php submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
+			<?php submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
 	<?php else : ?>
 	<p><?php _e( 'There are no valid users selected for deletion.' ); ?></p>
 	<?php endif; ?>
 	</div>
 	</form>
-	<?php
+		<?php
 
 		break;
 
@@ -387,46 +388,46 @@ foreach ( $userids as $id ) {
 		}
 
 		include( ABSPATH . 'wp-admin/admin-header.php' );
-	?>
+		?>
 	<form method="post" name="updateusers" id="updateusers">
-	<?php wp_nonce_field( 'remove-users' ); ?>
-<?php echo $referer; ?>
+		<?php wp_nonce_field( 'remove-users' ); ?>
+		<?php echo $referer; ?>
 
 <div class="wrap">
 <h1><?php _e( 'Remove Users from Site' ); ?></h1>
 
-<?php if ( 1 == count( $userids ) ) : ?>
+		<?php if ( 1 == count( $userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
-<?php else : ?>
+		<?php else : ?>
 	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
-<?php endif; ?>
+		<?php endif; ?>
 
 <ul>
-<?php
-	$go_remove = false;
-foreach ( $userids as $id ) {
-	$id   = (int) $id;
-	$user = get_userdata( $id );
-	if ( ! current_user_can( 'remove_user', $id ) ) {
-		/* translators: 1: user id, 2: user login */
-		echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>' ), $id, $user->user_login ) . "</li>\n";
-	} else {
-		/* translators: 1: user id, 2: user login */
-		echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
-		$go_remove = true;
-	}
-}
-	?>
+		<?php
+		$go_remove = false;
+		foreach ( $userids as $id ) {
+			$id   = (int) $id;
+			$user = get_userdata( $id );
+			if ( ! current_user_can( 'remove_user', $id ) ) {
+				/* translators: 1: user id, 2: user login */
+				echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>' ), $id, $user->user_login ) . "</li>\n";
+			} else {
+				/* translators: 1: user id, 2: user login */
+				echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
+				$go_remove = true;
+			}
+		}
+		?>
 	</ul>
-	<?php if ( $go_remove ) : ?>
+		<?php if ( $go_remove ) : ?>
 		<input type="hidden" name="action" value="doremove" />
-		<?php submit_button( __( 'Confirm Removal' ), 'primary' ); ?>
+			<?php submit_button( __( 'Confirm Removal' ), 'primary' ); ?>
 	<?php else : ?>
 	<p><?php _e( 'There are no valid users selected for removal.' ); ?></p>
 	<?php endif; ?>
 	</div>
 	</form>
-	<?php
+		<?php
 
 		break;
 
@@ -476,7 +477,8 @@ foreach ( $userids as $id ) {
 							__( 'New user created. <a href="%s">Edit user</a>' ),
 							esc_url(
 								add_query_arg(
-									'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+									'wp_http_referer',
+									urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
 									self_admin_url( 'user-edit.php?user_id=' . $user_id )
 								)
 							)
@@ -505,9 +507,9 @@ foreach ( $userids as $id ) {
 					break;
 			}
 		endif;
-	?>
+		?>
 
-	<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
+		<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
 		<div class="error">
 			<ul>
 			<?php
@@ -517,7 +519,7 @@ foreach ( $userids as $id ) {
 			?>
 			</ul>
 		</div>
-	<?php
+			<?php
 	endif;
 
 if ( ! empty( $messages ) ) {
@@ -529,18 +531,18 @@ if ( ! empty( $messages ) ) {
 
 	<div class="wrap">
 	<h1 class="wp-heading-inline">
-<?php
-echo esc_html( $title );
-?>
+		<?php
+		echo esc_html( $title );
+		?>
 </h1>
 
-<?php
-if ( current_user_can( 'create_users' ) ) {
-?>
+		<?php
+		if ( current_user_can( 'create_users' ) ) {
+			?>
 	<a href="<?php echo admin_url( 'user-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
 <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
 	<a href="<?php echo admin_url( 'user-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
-<?php
+			<?php
 }
 
 if ( strlen( $usersearch ) ) {
@@ -551,22 +553,22 @@ if ( strlen( $usersearch ) ) {
 
 <hr class="wp-header-end">
 
-<?php $wp_list_table->views(); ?>
+		<?php $wp_list_table->views(); ?>
 
 <form method="get">
 
-<?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
+		<?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
 
-<?php if ( ! empty( $_REQUEST['role'] ) ) { ?>
+		<?php if ( ! empty( $_REQUEST['role'] ) ) { ?>
 <input type="hidden" name="role" value="<?php echo esc_attr( $_REQUEST['role'] ); ?>" />
 <?php } ?>
 
-<?php $wp_list_table->display(); ?>
+		<?php $wp_list_table->display(); ?>
 </form>
 
 <br class="clear" />
 </div>
-<?php
+		<?php
 		break;
 
 } // end of the $doaction switch
diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php
index ade4fd2b4b..867badda2e 100644
--- a/wp-admin/widgets.php
+++ b/wp-admin/widgets.php
@@ -295,71 +295,71 @@ if ( isset( $_GET['editwidget'] ) && $_GET['editwidget'] ) {
 
 	<form action="widgets.php" method="post">
 	<div class="widget-inside">
-<?php
-if ( is_callable( $control_callback ) ) {
-	call_user_func_array( $control_callback, $control['params'] );
-} else {
-	echo '<p>' . __( 'There are no options for this widget.' ) . "</p>\n";
-}
-		?>
+	<?php
+	if ( is_callable( $control_callback ) ) {
+		call_user_func_array( $control_callback, $control['params'] );
+	} else {
+		echo '<p>' . __( 'There are no options for this widget.' ) . "</p>\n";
+	}
+	?>
 	</div>
 
 	<p class="describe"><?php _e( 'Select both the sidebar for this widget and the position of the widget in that sidebar.' ); ?></p>
 	<div class="widget-position">
 	<table class="widefat"><thead><tr><th><?php _e( 'Sidebar' ); ?></th><th><?php _e( 'Position' ); ?></th></tr></thead><tbody>
-<?php
-foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
-	echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sbname ) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
-	if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) {
-		echo '&nbsp;';
-	} else {
-		if ( ! isset( $sidebars_widgets[ $sbname ] ) || ! is_array( $sidebars_widgets[ $sbname ] ) ) {
-			$j                           = 1;
-			$sidebars_widgets[ $sbname ] = array();
+	<?php
+	foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
+		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sbname ) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
+		if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) {
+			echo '&nbsp;';
 		} else {
-			$j = count( $sidebars_widgets[ $sbname ] );
-			if ( isset( $_GET['addnew'] ) || ! in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
-				$j++;
+			if ( ! isset( $sidebars_widgets[ $sbname ] ) || ! is_array( $sidebars_widgets[ $sbname ] ) ) {
+				$j                           = 1;
+				$sidebars_widgets[ $sbname ] = array();
+			} else {
+				$j = count( $sidebars_widgets[ $sbname ] );
+				if ( isset( $_GET['addnew'] ) || ! in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
+					$j++;
+				}
 			}
-		}
-		$selected = '';
-		echo "\t\t<select name='{$sbname}_position'>\n";
-		echo "\t\t<option value=''>" . __( '&mdash; Select &mdash;' ) . "</option>\n";
-		for ( $i = 1; $i <= $j; $i++ ) {
-			if ( in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
-				$selected = selected( $i, $key + 1, false );
+			$selected = '';
+			echo "\t\t<select name='{$sbname}_position'>\n";
+			echo "\t\t<option value=''>" . __( '&mdash; Select &mdash;' ) . "</option>\n";
+			for ( $i = 1; $i <= $j; $i++ ) {
+				if ( in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
+					$selected = selected( $i, $key + 1, false );
+				}
+				echo "\t\t<option value='$i'$selected> $i </option>\n";
 			}
-			echo "\t\t<option value='$i'$selected> $i </option>\n";
+			echo "\t\t</select>\n";
 		}
-		echo "\t\t</select>\n";
+		echo "</td></tr>\n";
 	}
-	echo "</td></tr>\n";
-}
 	?>
 	</tbody></table>
 	</div>
 
 	<div class="widget-control-actions">
-<?php
-if ( isset( $_GET['addnew'] ) ) {
-	?>
+	<?php
+	if ( isset( $_GET['addnew'] ) ) {
+		?>
 	<a href="widgets.php" class="button alignleft"><?php _e( 'Cancel' ); ?></a>
-<?php
-} else {
-	submit_button( __( 'Delete' ), 'alignleft', 'removewidget', false );
-}
+		<?php
+	} else {
+		submit_button( __( 'Delete' ), 'alignleft', 'removewidget', false );
+	}
 	submit_button( __( 'Save Widget' ), 'primary alignright', 'savewidget', false );
 	?>
 	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr( $widget_id ); ?>" />
 	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr( $id_base ); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr( $multi_number ); ?>" />
-<?php	wp_nonce_field( "save-delete-widget-$widget_id" ); ?>
+	<?php	wp_nonce_field( "save-delete-widget-$widget_id" ); ?>
 	<br class="clear" />
 	</div>
 	</form>
 	</div>
 	</div>
-<?php
+	<?php
 	require_once( ABSPATH . 'wp-admin/admin-footer.php' );
 	exit;
 }
diff --git a/wp-comments-post.php b/wp-comments-post.php
index c61e73dcd1..5c33e87fd3 100644
--- a/wp-comments-post.php
+++ b/wp-comments-post.php
@@ -27,7 +27,9 @@ if ( is_wp_error( $comment ) ) {
 	$data = intval( $comment->get_error_data() );
 	if ( ! empty( $data ) ) {
 		wp_die(
-			'<p>' . $comment->get_error_message() . '</p>', __( 'Comment Submission Failure' ), array(
+			'<p>' . $comment->get_error_message() . '</p>',
+			__( 'Comment Submission Failure' ),
+			array(
 				'response'  => $data,
 				'back_link' => true,
 			)
@@ -37,7 +39,7 @@ if ( is_wp_error( $comment ) ) {
 	}
 }
 
-$user = wp_get_current_user();
+$user            = wp_get_current_user();
 $cookies_consent = ( isset( $_POST['wp-comment-cookies-consent'] ) );
 
 /**
diff --git a/wp-content/themes/twentyeleven/404.php b/wp-content/themes/twentyeleven/404.php
index d4fe3dd029..897463138c 100644
--- a/wp-content/themes/twentyeleven/404.php
+++ b/wp-content/themes/twentyeleven/404.php
@@ -37,7 +37,7 @@ get_header(); ?>
 								'number'     => 10,
 							)
 						);
-?>
+						?>
 						</ul>
 					</div>
 
@@ -45,10 +45,12 @@ get_header(); ?>
 					/* translators: %1$s: smilie */
 					$archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'twentyeleven' ), convert_smilies( ':)' ) ) . '</p>';
 					the_widget(
-						'WP_Widget_Archives', array(
+						'WP_Widget_Archives',
+						array(
 							'count'    => 0,
 							'dropdown' => 1,
-						), array( 'after_title' => '</h2>' . $archive_content )
+						),
+						array( 'after_title' => '</h2>' . $archive_content )
 					);
 					?>
 
diff --git a/wp-content/themes/twentyeleven/archive.php b/wp-content/themes/twentyeleven/archive.php
index 605ac21ced..9684c7b57f 100644
--- a/wp-content/themes/twentyeleven/archive.php
+++ b/wp-content/themes/twentyeleven/archive.php
@@ -39,7 +39,7 @@ get_header(); ?>
 				<?php
 				while ( have_posts() ) :
 					the_post();
-?>
+					?>
 
 					<?php
 						/* Include the Post-Format-specific template for the content.
diff --git a/wp-content/themes/twentyeleven/author.php b/wp-content/themes/twentyeleven/author.php
index e25a72142e..c6d68e216d 100644
--- a/wp-content/themes/twentyeleven/author.php
+++ b/wp-content/themes/twentyeleven/author.php
@@ -43,7 +43,7 @@ get_header(); ?>
 				<?php
 				// If a user has filled out their description, show a bio on their entries.
 				if ( get_the_author_meta( 'description' ) ) :
-				?>
+					?>
 				<div id="author-info">
 					<div id="author-avatar">
 						<?php
@@ -68,7 +68,7 @@ get_header(); ?>
 				<?php
 				while ( have_posts() ) :
 					the_post();
-?>
+					?>
 
 					<?php
 						/*
diff --git a/wp-content/themes/twentyeleven/category.php b/wp-content/themes/twentyeleven/category.php
index fcd71a3789..903ef11676 100644
--- a/wp-content/themes/twentyeleven/category.php
+++ b/wp-content/themes/twentyeleven/category.php
@@ -42,7 +42,7 @@ get_header(); ?>
 				<?php
 				while ( have_posts() ) :
 					the_post();
-?>
+					?>
 
 					<?php
 						/*
diff --git a/wp-content/themes/twentyeleven/comments.php b/wp-content/themes/twentyeleven/comments.php
index 11f95e0329..68028598be 100644
--- a/wp-content/themes/twentyeleven/comments.php
+++ b/wp-content/themes/twentyeleven/comments.php
@@ -16,7 +16,7 @@
 	<?php if ( post_password_required() ) : ?>
 		<p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyeleven' ); ?></p>
 	</div><!-- #comments -->
-	<?php
+		<?php
 			/*
 			 * Stop the rest of comments.php from being processed,
 			 * but don't kill the script entirely -- we still have
@@ -24,7 +24,7 @@
 			 */
 			return;
 		endif;
-	?>
+?>
 
 	<?php // You can start editing here -- including this comment! ?>
 
@@ -33,7 +33,8 @@
 			<?php
 				printf(
 					_n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentyeleven' ),
-					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
+					number_format_i18n( get_comments_number() ),
+					'<span>' . get_the_title() . '</span>'
 				);
 			?>
 		</h2>
@@ -73,7 +74,7 @@
 		 * But we only want the note on posts and pages that had comments in the first place.
 		 */
 		if ( ! comments_open() && get_comments_number() ) :
-		?>
+			?>
 		<p class="nocomments"><?php _e( 'Comments are closed.', 'twentyeleven' ); ?></p>
 		<?php endif; ?>
 
diff --git a/wp-content/themes/twentyeleven/content-aside.php b/wp-content/themes/twentyeleven/content-aside.php
index aab63455a6..258db8fc45 100644
--- a/wp-content/themes/twentyeleven/content-aside.php
+++ b/wp-content/themes/twentyeleven/content-aside.php
@@ -40,7 +40,7 @@
 					'after'  => '</div>',
 				)
 			);
-?>
+			?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
diff --git a/wp-content/themes/twentyeleven/content-featured.php b/wp-content/themes/twentyeleven/content-featured.php
index 9340f5f1be..8d8fd4f90d 100644
--- a/wp-content/themes/twentyeleven/content-featured.php
+++ b/wp-content/themes/twentyeleven/content-featured.php
@@ -27,7 +27,7 @@ global $feature_class;
 				'after'  => '</div>',
 			)
 		);
-?>
+		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
@@ -47,7 +47,7 @@ global $feature_class;
 				esc_url( get_permalink() ),
 				the_title_attribute( 'echo=0' )
 			);
-		?>
+			?>
 
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-meta -->
diff --git a/wp-content/themes/twentyeleven/content-gallery.php b/wp-content/themes/twentyeleven/content-gallery.php
index a35b9c039f..a95f92c1e4 100644
--- a/wp-content/themes/twentyeleven/content-gallery.php
+++ b/wp-content/themes/twentyeleven/content-gallery.php
@@ -32,28 +32,28 @@
 		<div class="entry-content">
 			<?php if ( post_password_required() ) : ?>
 				<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php
+				<?php
 			else :
 				$images = twentyeleven_get_gallery_images();
 				if ( $images ) :
 					$total_images = count( $images );
 					$image        = reset( $images );
-			?>
+					?>
 				<figure class="gallery-thumb">
 					<a href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
 	</figure><!-- .gallery-thumb -->
 
 	<p><em>
-	<?php
-				printf(
-					_n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyeleven' ),
-					'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
-					number_format_i18n( $total_images )
-				);
-								?>
+					<?php
+					printf(
+						_n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyeleven' ),
+						'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
+						number_format_i18n( $total_images )
+					);
+					?>
 					</em></p>
 						<?php endif; // end twentyeleven_get_gallery_images() check ?>
-			<?php the_excerpt(); ?>
+				<?php the_excerpt(); ?>
 		<?php endif; ?>
 		<?php
 		wp_link_pages(
@@ -62,7 +62,7 @@
 				'after'  => '</div>',
 			)
 		);
-?>
+		?>
 	</div><!-- .entry-content -->
 	<?php endif; ?>
 
@@ -72,11 +72,11 @@
 			/* translators: used between list items, there is a space after the comma */
 			$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
 		if ( $categories_list ) :
-		?>
+			?>
 		<span class="cat-links">
-		<?php
+			<?php
 			printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
-		$show_sep = true;
+			$show_sep = true;
 			?>
 		</span>
 		<?php endif; // End if categories ?>
@@ -85,7 +85,7 @@
 			$tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
 		if ( $tags_list ) :
 			if ( $show_sep ) :
-			?>
+				?>
 		<span class="sep"> | </span>
 			<?php endif; // End if $show_sep ?>
 		<span class="tag-links">
@@ -97,7 +97,7 @@
 		<?php endif; // End if $tags_list ?>
 
 		<?php if ( comments_open() ) : ?>
-		<?php if ( $show_sep ) : ?>
+			<?php if ( $show_sep ) : ?>
 		<span class="sep"> | </span>
 		<?php endif; // End if $show_sep ?>
 		<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
diff --git a/wp-content/themes/twentyeleven/content-image.php b/wp-content/themes/twentyeleven/content-image.php
index e28e8a0c95..6ed6a51a35 100644
--- a/wp-content/themes/twentyeleven/content-image.php
+++ b/wp-content/themes/twentyeleven/content-image.php
@@ -34,7 +34,7 @@
 					'after'  => '</div>',
 				)
 			);
-?>
+			?>
 		</div><!-- .entry-content -->
 
 		<footer class="entry-meta">
@@ -49,16 +49,16 @@
 						esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
 						get_the_author()
 					);
-				?>
+					?>
 			</div><!-- .entry-meta -->
 			<div class="entry-meta">
 				<?php
 					/* translators: used between list items, there is a space after the comma */
 					$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
 				if ( $categories_list ) :
-				?>
+					?>
 				<span class="cat-links">
-				<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
+					<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
 				</span>
 				<?php endif; // End if categories ?>
 				<?php
diff --git a/wp-content/themes/twentyeleven/content-intro.php b/wp-content/themes/twentyeleven/content-intro.php
index 5fe87ffadb..2882b8fe9c 100644
--- a/wp-content/themes/twentyeleven/content-intro.php
+++ b/wp-content/themes/twentyeleven/content-intro.php
@@ -22,7 +22,7 @@
 				'after'  => '</div>',
 			)
 		);
-?>
+		?>
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 	</div><!-- .entry-content -->
 </article><!-- #post-<?php the_ID(); ?> -->
diff --git a/wp-content/themes/twentyeleven/content-link.php b/wp-content/themes/twentyeleven/content-link.php
index 88e710e86f..bf4743e4ec 100644
--- a/wp-content/themes/twentyeleven/content-link.php
+++ b/wp-content/themes/twentyeleven/content-link.php
@@ -40,7 +40,7 @@
 					'after'  => '</div>',
 				)
 			);
-?>
+			?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
diff --git a/wp-content/themes/twentyeleven/content-page.php b/wp-content/themes/twentyeleven/content-page.php
index accf1e7a3b..968a0cac45 100644
--- a/wp-content/themes/twentyeleven/content-page.php
+++ b/wp-content/themes/twentyeleven/content-page.php
@@ -22,7 +22,7 @@
 				'after'  => '</div>',
 			)
 		);
-?>
+		?>
 	</div><!-- .entry-content -->
 	<footer class="entry-meta">
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
diff --git a/wp-content/themes/twentyeleven/content-quote.php b/wp-content/themes/twentyeleven/content-quote.php
index 3eb9409751..f2a958327c 100644
--- a/wp-content/themes/twentyeleven/content-quote.php
+++ b/wp-content/themes/twentyeleven/content-quote.php
@@ -40,7 +40,7 @@
 					'after'  => '</div>',
 				)
 			);
-?>
+			?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
@@ -50,11 +50,11 @@
 				/* translators: used between list items, there is a space after the comma */
 				$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
 			if ( $categories_list ) :
-			?>
+				?>
 			<span class="cat-links">
-			<?php
+				<?php
 				printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
-			$show_sep = true;
+				$show_sep = true;
 				?>
 			</span>
 			<?php endif; // End if categories ?>
@@ -63,7 +63,7 @@
 				$tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
 			if ( $tags_list ) :
 				if ( $show_sep ) :
-				?>
+					?>
 			<span class="sep"> | </span>
 				<?php endif; // End if $show_sep ?>
 			<span class="tag-links">
@@ -75,7 +75,7 @@
 			<?php endif; // End if $tags_list ?>
 
 			<?php if ( comments_open() ) : ?>
-			<?php if ( $show_sep ) : ?>
+				<?php if ( $show_sep ) : ?>
 			<span class="sep"> | </span>
 			<?php endif; // End if $show_sep ?>
 			<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
diff --git a/wp-content/themes/twentyeleven/content-single.php b/wp-content/themes/twentyeleven/content-single.php
index be4915d6b5..2615513e45 100644
--- a/wp-content/themes/twentyeleven/content-single.php
+++ b/wp-content/themes/twentyeleven/content-single.php
@@ -28,7 +28,7 @@
 				'after'  => '</div>',
 			)
 		);
-?>
+		?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
@@ -55,7 +55,7 @@
 				get_the_author(),
 				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )
 			);
-		?>
+			?>
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 
 		<?php if ( get_the_author_meta( 'description' ) && ( ! function_exists( 'is_multi_author' ) || is_multi_author() ) ) : // If a user has filled out their description and this is a multi-author blog, show a bio on their entries ?>
diff --git a/wp-content/themes/twentyeleven/content-status.php b/wp-content/themes/twentyeleven/content-status.php
index 7a0bf90647..b7ac2b6be6 100644
--- a/wp-content/themes/twentyeleven/content-status.php
+++ b/wp-content/themes/twentyeleven/content-status.php
@@ -53,7 +53,7 @@
 					'after'  => '</div>',
 				)
 			);
-?>
+			?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
diff --git a/wp-content/themes/twentyeleven/content.php b/wp-content/themes/twentyeleven/content.php
index 797726d7c5..7da6cc5fa9 100644
--- a/wp-content/themes/twentyeleven/content.php
+++ b/wp-content/themes/twentyeleven/content.php
@@ -46,46 +46,46 @@
 					'after'  => '</div>',
 				)
 			);
-?>
+			?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
 		<footer class="entry-meta">
 			<?php $show_sep = false; ?>
 			<?php if ( is_object_in_taxonomy( get_post_type(), 'category' ) ) : // Hide category text when not supported ?>
-			<?php
+				<?php
 				/* translators: used between list items, there is a space after the comma */
 				$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
-			if ( $categories_list ) :
-			?>
+				if ( $categories_list ) :
+					?>
 			<span class="cat-links">
-			<?php
-				printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
-			$show_sep = true;
-				?>
+					<?php
+					printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
+					$show_sep = true;
+					?>
 			</span>
-			<?php endif; // End if categories ?>
+				<?php endif; // End if categories ?>
 			<?php endif; // End if is_object_in_taxonomy( get_post_type(), 'category' ) ?>
 			<?php if ( is_object_in_taxonomy( get_post_type(), 'post_tag' ) ) : // Hide tag text when not supported ?>
-			<?php
+				<?php
 				/* translators: used between list items, there is a space after the comma */
 				$tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-			if ( $tags_list ) :
-				if ( $show_sep ) :
-				?>
+				if ( $tags_list ) :
+					if ( $show_sep ) :
+						?>
 			<span class="sep"> | </span>
-				<?php endif; // End if $show_sep ?>
+					<?php endif; // End if $show_sep ?>
 			<span class="tag-links">
-				<?php
-				printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
-				$show_sep = true;
-				?>
+					<?php
+					printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
+					$show_sep = true;
+					?>
 			</span>
-			<?php endif; // End if $tags_list ?>
+				<?php endif; // End if $tags_list ?>
 			<?php endif; // End if is_object_in_taxonomy( get_post_type(), 'post_tag' ) ?>
 
 			<?php if ( comments_open() ) : ?>
-			<?php if ( $show_sep ) : ?>
+				<?php if ( $show_sep ) : ?>
 			<span class="sep"> | </span>
 			<?php endif; // End if $show_sep ?>
 			<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
diff --git a/wp-content/themes/twentyeleven/functions.php b/wp-content/themes/twentyeleven/functions.php
index 0349823c2b..320bd41a56 100644
--- a/wp-content/themes/twentyeleven/functions.php
+++ b/wp-content/themes/twentyeleven/functions.php
@@ -107,7 +107,8 @@ if ( ! function_exists( 'twentyeleven_setup' ) ) :
 
 		// Add support for custom backgrounds.
 		add_theme_support(
-			'custom-background', array(
+			'custom-background',
+			array(
 				/*
 				* Let WordPress know what our default background color is.
 				* This is dependent on our current color scheme.
@@ -258,24 +259,24 @@ if ( ! function_exists( 'twentyeleven_header_style' ) ) :
 		<?php
 		// Has the text been hidden?
 		if ( 'blank' == $text_color ) :
-	?>
+			?>
 		#site-title,
 		#site-description {
 			position: absolute;
 			clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
 			clip: rect(1px, 1px, 1px, 1px);
 		}
-	<?php
-		// If the user has set a custom color for the text use that
+			<?php
+			// If the user has set a custom color for the text use that
 		else :
-	?>
+			?>
 		#site-title a,
 		#site-description {
 			color: #<?php echo $text_color; ?>;
 		}
 	<?php endif; ?>
 	</style>
-	<?php
+		<?php
 	}
 endif; // twentyeleven_header_style
 
@@ -288,7 +289,7 @@ if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :
 	 * @since Twenty Eleven 1.0
 	 */
 	function twentyeleven_admin_header_style() {
-	?>
+		?>
 	<style type="text/css" id="twentyeleven-admin-header-css">
 	.appearance_page_custom-header #headimg {
 		border: none;
@@ -310,10 +311,10 @@ if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :
 		line-height: 23px;
 		padding: 0 0 3em;
 	}
-	<?php
+		<?php
 		// If the user has set a custom color for the text use that
-	if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :
-	?>
+		if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :
+			?>
 	#site-title a,
 	#site-description {
 		color: #<?php echo get_header_textcolor(); ?>;
@@ -325,7 +326,7 @@ if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :
 		width: 100%;
 	}
 	</style>
-	<?php
+		<?php
 	}
 endif; // twentyeleven_admin_header_style
 
@@ -339,7 +340,7 @@ if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :
 	 */
 	function twentyeleven_admin_header_image() {
 
-?>
+		?>
 		<div id="headimg">
 			<?php
 			$color = get_header_textcolor();
@@ -355,7 +356,7 @@ if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :
 			<img src="<?php echo esc_url( $image ); ?>" alt="" />
 		<?php endif; ?>
 		</div>
-	<?php
+		<?php
 	}
 endif; // twentyeleven_admin_header_image
 
@@ -529,13 +530,13 @@ if ( ! function_exists( 'twentyeleven_content_nav' ) ) :
 		global $wp_query;
 
 		if ( $wp_query->max_num_pages > 1 ) :
-	?>
+			?>
 			<nav id="<?php echo esc_attr( $html_id ); ?>">
 				<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
 				<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven' ) ); ?></div>
 				<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></div>
 			</nav><!-- #nav-above -->
-		<?php
+			<?php
 	endif;
 	}
 endif; // twentyeleven_content_nav
@@ -636,13 +637,13 @@ if ( ! function_exists( 'twentyeleven_comment' ) ) :
 		switch ( $comment->comment_type ) :
 			case 'pingback':
 			case 'trackback':
-		?>
+				?>
 		<li class="post pingback">
 		<p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
-	<?php
+				<?php
 				break;
 			default:
-		?>
+				?>
 		<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
 		<article id="comment-<?php comment_ID(); ?>" class="comment">
 			<footer class="comment-meta">
@@ -667,7 +668,7 @@ if ( ! function_exists( 'twentyeleven_comment' ) ) :
 								sprintf( __( '%1$s at %2$s', 'twentyeleven' ), get_comment_date(), get_comment_time() )
 							)
 						);
-						?>
+					?>
 
 						<?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 					</div><!-- .comment-author .vcard -->
@@ -685,18 +686,19 @@ if ( ! function_exists( 'twentyeleven_comment' ) ) :
 					<?php
 					comment_reply_link(
 						array_merge(
-							$args, array(
+							$args,
+							array(
 								'reply_text' => __( 'Reply <span>&darr;</span>', 'twentyeleven' ),
 								'depth'      => $depth,
 								'max_depth'  => $args['max_depth'],
 							)
 						)
 					);
-?>
+					?>
 				</div><!-- .reply -->
 			</article><!-- #comment-## -->
 
-		<?php
+				<?php
 				break;
 		endswitch;
 	}
diff --git a/wp-content/themes/twentyeleven/header.php b/wp-content/themes/twentyeleven/header.php
index df8f7eeef9..78e9264f85 100644
--- a/wp-content/themes/twentyeleven/header.php
+++ b/wp-content/themes/twentyeleven/header.php
@@ -45,7 +45,7 @@ if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
 	echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) ) );
 }
 
-	?>
+?>
 	</title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
@@ -128,14 +128,14 @@ if ( is_singular() && get_option( 'thread_comments' ) ) {
 				if ( $header_image ) {
 					$header_image_class = ' with-image';
 				}
-			?>
+				?>
 			<div class="only-search<?php echo $header_image_class; ?>">
-			<?php get_search_form(); ?>
-			</div>
-			<?php
-				else :
-			?>
 				<?php get_search_form(); ?>
+			</div>
+				<?php
+				else :
+					?>
+					<?php get_search_form(); ?>
 			<?php endif; ?>
 
 			<nav id="access" role="navigation">
diff --git a/wp-content/themes/twentyeleven/image.php b/wp-content/themes/twentyeleven/image.php
index ea20928542..454ee95fbe 100644
--- a/wp-content/themes/twentyeleven/image.php
+++ b/wp-content/themes/twentyeleven/image.php
@@ -51,43 +51,43 @@ get_header(); ?>
 
 							<div class="entry-attachment">
 								<div class="attachment">
-<?php
-	/*
-	 * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
-	 * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
-	 */
-	$attachments = array_values(
-		get_children(
-			array(
-				'post_parent'    => $post->post_parent,
-				'post_status'    => 'inherit',
-				'post_type'      => 'attachment',
-				'post_mime_type' => 'image',
-				'order'          => 'ASC',
-				'orderby'        => 'menu_order ID',
-			)
-		)
-	);
-foreach ( $attachments as $k => $attachment ) {
-	if ( $attachment->ID == $post->ID ) {
-		break;
-	}
-}
+				<?php
+				/*
+				* Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
+				* or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
+				*/
+				$attachments = array_values(
+					get_children(
+						array(
+							'post_parent'    => $post->post_parent,
+							'post_status'    => 'inherit',
+							'post_type'      => 'attachment',
+							'post_mime_type' => 'image',
+							'order'          => 'ASC',
+							'orderby'        => 'menu_order ID',
+						)
+					)
+				);
+				foreach ( $attachments as $k => $attachment ) {
+					if ( $attachment->ID == $post->ID ) {
+						break;
+					}
+				}
 
-	// If there is more than 1 attachment in a gallery
-if ( count( $attachments ) > 1 ) {
-	$k++;
-	if ( isset( $attachments[ $k ] ) ) {
-		// get the URL of the next image attachment
-		$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
-	} else {      // or get the URL of the first image attachment
-		$next_attachment_url = get_attachment_link( $attachments[0]->ID );
-	}
-} else {
-	// or, if there's only 1 image, get the URL of the image
-	$next_attachment_url = wp_get_attachment_url();
-}
-?>
+				// If there is more than 1 attachment in a gallery
+				if ( count( $attachments ) > 1 ) {
+					$k++;
+					if ( isset( $attachments[ $k ] ) ) {
+						// get the URL of the next image attachment
+						$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+					} else {      // or get the URL of the first image attachment
+						$next_attachment_url = get_attachment_link( $attachments[0]->ID );
+					}
+				} else {
+					// or, if there's only 1 image, get the URL of the image
+					$next_attachment_url = wp_get_attachment_url();
+				}
+				?>
 									<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
 														<?php
 														/**
@@ -99,7 +99,7 @@ if ( count( $attachments ) > 1 ) {
 														 */
 														$attachment_size = apply_filters( 'twentyeleven_attachment_size', 848 );
 														echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
-									?>
+														?>
 									</a>
 
 									<?php if ( ! empty( $post->post_excerpt ) ) : ?>
@@ -120,7 +120,7 @@ if ( count( $attachments ) > 1 ) {
 										'after'  => '</div>',
 									)
 								);
-?>
+								?>
 							</div><!-- .entry-description -->
 
 						</div><!-- .entry-content -->
diff --git a/wp-content/themes/twentyeleven/inc/theme-options.php b/wp-content/themes/twentyeleven/inc/theme-options.php
index 8974b151e9..f296c982e5 100644
--- a/wp-content/themes/twentyeleven/inc/theme-options.php
+++ b/wp-content/themes/twentyeleven/inc/theme-options.php
@@ -274,7 +274,7 @@ function twentyeleven_settings_field_color_scheme() {
 	$options = twentyeleven_get_theme_options();
 
 	foreach ( twentyeleven_color_schemes() as $scheme ) {
-	?>
+		?>
 	<div class="layout image-radio-option color-scheme">
 	<label class="description">
 		<input type="radio" name="twentyeleven_theme_options[color_scheme]" value="<?php echo esc_attr( $scheme['value'] ); ?>" <?php checked( $options['color_scheme'], $scheme['value'] ); ?> />
@@ -285,7 +285,7 @@ function twentyeleven_settings_field_color_scheme() {
 		</span>
 	</label>
 	</div>
-	<?php
+		<?php
 	}
 }
 
@@ -438,7 +438,7 @@ function twentyeleven_print_link_color_style() {
 	if ( $default_options['link_color'] == $link_color ) {
 		return;
 	}
-?>
+	?>
 	<style>
 		/* Link color */
 		a,
@@ -466,7 +466,7 @@ function twentyeleven_print_link_color_style() {
 			background-color: <?php echo $link_color; ?>;
 		}
 	</style>
-<?php
+	<?php
 }
 add_action( 'wp_head', 'twentyeleven_print_link_color_style' );
 
@@ -523,14 +523,16 @@ function twentyeleven_customize_register( $wp_customize ) {
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
 		$wp_customize->selective_refresh->add_partial(
-			'blogname', array(
+			'blogname',
+			array(
 				'selector'            => '#site-title a',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentyeleven_customize_partial_blogname',
 			)
 		);
 		$wp_customize->selective_refresh->add_partial(
-			'blogdescription', array(
+			'blogdescription',
+			array(
 				'selector'            => '#site-description',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentyeleven_customize_partial_blogdescription',
@@ -542,7 +544,8 @@ function twentyeleven_customize_register( $wp_customize ) {
 	$defaults = twentyeleven_get_default_theme_options();
 
 	$wp_customize->add_setting(
-		'twentyeleven_theme_options[color_scheme]', array(
+		'twentyeleven_theme_options[color_scheme]',
+		array(
 			'default'    => $defaults['color_scheme'],
 			'type'       => 'option',
 			'capability' => 'edit_theme_options',
@@ -556,7 +559,8 @@ function twentyeleven_customize_register( $wp_customize ) {
 	}
 
 	$wp_customize->add_control(
-		'twentyeleven_color_scheme', array(
+		'twentyeleven_color_scheme',
+		array(
 			'label'    => __( 'Color Scheme', 'twentyeleven' ),
 			'section'  => 'colors',
 			'settings' => 'twentyeleven_theme_options[color_scheme]',
@@ -568,7 +572,8 @@ function twentyeleven_customize_register( $wp_customize ) {
 
 	// Link Color (added to Color Scheme section in Customizer)
 	$wp_customize->add_setting(
-		'twentyeleven_theme_options[link_color]', array(
+		'twentyeleven_theme_options[link_color]',
+		array(
 			'default'           => twentyeleven_get_default_link_color( $options['color_scheme'] ),
 			'type'              => 'option',
 			'sanitize_callback' => 'sanitize_hex_color',
@@ -578,7 +583,9 @@ function twentyeleven_customize_register( $wp_customize ) {
 
 	$wp_customize->add_control(
 		new WP_Customize_Color_Control(
-			$wp_customize, 'link_color', array(
+			$wp_customize,
+			'link_color',
+			array(
 				'label'    => __( 'Link Color', 'twentyeleven' ),
 				'section'  => 'colors',
 				'settings' => 'twentyeleven_theme_options[link_color]',
@@ -588,14 +595,16 @@ function twentyeleven_customize_register( $wp_customize ) {
 
 	// Default Layout
 	$wp_customize->add_section(
-		'twentyeleven_layout', array(
+		'twentyeleven_layout',
+		array(
 			'title'    => __( 'Layout', 'twentyeleven' ),
 			'priority' => 50,
 		)
 	);
 
 	$wp_customize->add_setting(
-		'twentyeleven_theme_options[theme_layout]', array(
+		'twentyeleven_theme_options[theme_layout]',
+		array(
 			'type'              => 'option',
 			'default'           => $defaults['theme_layout'],
 			'sanitize_callback' => 'sanitize_key',
@@ -609,7 +618,8 @@ function twentyeleven_customize_register( $wp_customize ) {
 	}
 
 	$wp_customize->add_control(
-		'twentyeleven_theme_options[theme_layout]', array(
+		'twentyeleven_theme_options[theme_layout]',
+		array(
 			'section' => 'twentyeleven_layout',
 			'type'    => 'radio',
 			'choices' => $choices,
diff --git a/wp-content/themes/twentyeleven/inc/widgets.php b/wp-content/themes/twentyeleven/inc/widgets.php
index 08ab7f7bad..17e9a7ce1b 100644
--- a/wp-content/themes/twentyeleven/inc/widgets.php
+++ b/wp-content/themes/twentyeleven/inc/widgets.php
@@ -19,7 +19,9 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 	 */
 	function __construct() {
 		parent::__construct(
-			'widget_twentyeleven_ephemera', __( 'Twenty Eleven Ephemera', 'twentyeleven' ), array(
+			'widget_twentyeleven_ephemera',
+			__( 'Twenty Eleven Ephemera', 'twentyeleven' ),
+			array(
 				'classname'                   => 'widget_twentyeleven_ephemera',
 				'description'                 => __( 'Use this widget to list your recent Aside, Status, Quote, and Link posts', 'twentyeleven' ),
 				'customize_selective_refresh' => true,
@@ -106,7 +108,7 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 			<?php
 			while ( $ephemera->have_posts() ) :
 				$ephemera->the_post();
-?>
+				?>
 
 				<?php if ( 'link' != get_post_format() ) : ?>
 
@@ -188,7 +190,7 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 	function form( $instance ) {
 		$title  = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
 		$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 10;
-?>
+		?>
 			<p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'twentyeleven' ); ?></label>
 			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
 
diff --git a/wp-content/themes/twentyeleven/index.php b/wp-content/themes/twentyeleven/index.php
index a67445bfff..b43b3f5268 100644
--- a/wp-content/themes/twentyeleven/index.php
+++ b/wp-content/themes/twentyeleven/index.php
@@ -25,7 +25,7 @@ get_header(); ?>
 				<?php
 				while ( have_posts() ) :
 					the_post();
-?>
+					?>
 
 					<?php get_template_part( 'content', get_post_format() ); ?>
 
diff --git a/wp-content/themes/twentyeleven/page.php b/wp-content/themes/twentyeleven/page.php
index 166823479b..4b322e84fa 100644
--- a/wp-content/themes/twentyeleven/page.php
+++ b/wp-content/themes/twentyeleven/page.php
@@ -20,7 +20,7 @@ get_header(); ?>
 				<?php
 				while ( have_posts() ) :
 					the_post();
-?>
+					?>
 
 					<?php get_template_part( 'content', 'page' ); ?>
 
diff --git a/wp-content/themes/twentyeleven/search.php b/wp-content/themes/twentyeleven/search.php
index 81188fadf7..62fbfc2ff8 100644
--- a/wp-content/themes/twentyeleven/search.php
+++ b/wp-content/themes/twentyeleven/search.php
@@ -24,7 +24,7 @@ get_header(); ?>
 				<?php
 				while ( have_posts() ) :
 					the_post();
-?>
+					?>
 
 					<?php
 						/*
diff --git a/wp-content/themes/twentyeleven/showcase.php b/wp-content/themes/twentyeleven/showcase.php
index f869871b79..f0b1da96f1 100644
--- a/wp-content/themes/twentyeleven/showcase.php
+++ b/wp-content/themes/twentyeleven/showcase.php
@@ -28,15 +28,15 @@ get_header(); ?>
 					the_post();
 					?>
 
-				<?php
+					<?php
 					/*
 					 * We are using a heading by rendering the_content
 					 * If we have content for this page, let's display it.
 					 */
-				if ( '' != get_the_content() ) {
-					get_template_part( 'content', 'intro' );
-				}
-				?>
+					if ( '' != get_the_content() ) {
+						get_template_part( 'content', 'intro' );
+					}
+					?>
 
 				<?php endwhile; ?>
 
@@ -77,88 +77,88 @@ get_header(); ?>
 						} else {
 							$header_image_width = HEADER_IMAGE_WIDTH;
 						}
-					?>
+						?>
 
 					<div class="featured-posts">
 					<h1 class="showcase-heading"><?php _e( 'Featured Post', 'twentyeleven' ); ?></h1>
 
-				<?php
-				// Let's roll.
-				while ( $featured->have_posts() ) :
-					$featured->the_post();
+						<?php
+						// Let's roll.
+						while ( $featured->have_posts() ) :
+							$featured->the_post();
 
-					// Increase the counter.
-					$counter_slider++;
+							// Increase the counter.
+							$counter_slider++;
 
-					/*
-					* We're going to add a class to our featured post for featured images
-					* by default it'll have the feature-text class.
-					*/
-					$feature_class = 'feature-text';
+							/*
+							* We're going to add a class to our featured post for featured images
+							* by default it'll have the feature-text class.
+							*/
+							$feature_class = 'feature-text';
 
-					if ( has_post_thumbnail() ) {
-						// ... but if it has a featured image let's add some class
-						$feature_class = 'feature-image small';
+							if ( has_post_thumbnail() ) {
+								// ... but if it has a featured image let's add some class
+								$feature_class = 'feature-image small';
 
-						// Hang on. Let's check this here image out.
-						$image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) );
+								// Hang on. Let's check this here image out.
+								$image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) );
 
-						// Is it bigger than or equal to our header?
-						if ( $image[1] >= $header_image_width ) {
-							// If bigger, let's add a BIGGER class. It's EXTRA classy now.
-							$feature_class = 'feature-image large';
-						}
-					}
-					?>
+								// Is it bigger than or equal to our header?
+								if ( $image[1] >= $header_image_width ) {
+									// If bigger, let's add a BIGGER class. It's EXTRA classy now.
+									$feature_class = 'feature-image large';
+								}
+							}
+							?>
 
 					<section class="featured-post <?php echo esc_attr( $feature_class ); ?>" id="featured-post-<?php echo esc_attr( $counter_slider ); ?>">
 
-					<?php
-						/*
-						 * If the thumbnail is as big as the header image
-						 * make it a large featured post, otherwise render it small
-						 */
-					if ( has_post_thumbnail() ) {
-						if ( $image[1] >= $header_image_width ) {
-							$thumbnail_size = 'large-feature';
-						} else {
-							$thumbnail_size = 'small-feature';
-						}
-						?>
-						<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_post_thumbnail( $thumbnail_size ); ?></a>
 							<?php
-					}
-						?>
-						<?php get_template_part( 'content', 'featured' ); ?>
+								/*
+								 * If the thumbnail is as big as the header image
+								 * make it a large featured post, otherwise render it small
+								 */
+							if ( has_post_thumbnail() ) {
+								if ( $image[1] >= $header_image_width ) {
+									$thumbnail_size = 'large-feature';
+								} else {
+									$thumbnail_size = 'small-feature';
+								}
+								?>
+						<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_post_thumbnail( $thumbnail_size ); ?></a>
+								<?php
+							}
+							?>
+							<?php get_template_part( 'content', 'featured' ); ?>
 					</section>
-				<?php endwhile; ?>
+						<?php endwhile; ?>
 
-					<?php
-					// Show slider only if we have more than one featured post.
-					if ( $featured->post_count > 1 ) :
-					?>
+						<?php
+						// Show slider only if we have more than one featured post.
+						if ( $featured->post_count > 1 ) :
+							?>
 					<nav class="feature-slider">
 					<ul>
-					<?php
+							<?php
 
-					// Reset the counter so that we end up with matching elements
-					$counter_slider = 0;
+							// Reset the counter so that we end up with matching elements
+							$counter_slider = 0;
 
-					// Begin from zero
-					rewind_posts();
+							// Begin from zero
+							rewind_posts();
 
-					// Let's roll again.
-					while ( $featured->have_posts() ) :
-						$featured->the_post();
-						$counter_slider++;
-						if ( 1 == $counter_slider ) {
-							$class = ' class="active"';
-						} else {
-							$class = '';
-						}
-					?>
+							// Let's roll again.
+							while ( $featured->have_posts() ) :
+								$featured->the_post();
+								$counter_slider++;
+								if ( 1 == $counter_slider ) {
+									$class = ' class="active"';
+								} else {
+									$class = '';
+								}
+								?>
 					<li><a href="#featured-post-<?php echo esc_attr( $counter_slider ); ?>" title="<?php echo esc_attr( sprintf( __( 'Featuring: %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>"<?php echo $class; ?>></a></li>
-					<?php endwhile; ?>
+						<?php endwhile; ?>
 					</ul>
 					</nav>
 					<?php endif; // End check for more than one sticky post. ?>
@@ -206,7 +206,7 @@ get_header(); ?>
 					// For all other recent posts, just display the title and comment status.
 					while ( $recent->have_posts() ) :
 						$recent->the_post();
-					?>
+						?>
 
 						<li class="entry-title">
 							<a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
@@ -215,7 +215,7 @@ get_header(); ?>
 							</span>
 						</li>
 
-					<?php
+						<?php
 					endwhile;
 
 					// If we had some posts, close the <ol>
@@ -230,7 +230,9 @@ get_header(); ?>
 
 						<?php
 						the_widget(
-							'Twenty_Eleven_Ephemera_Widget', '', array(
+							'Twenty_Eleven_Ephemera_Widget',
+							'',
+							array(
 								'before_title' => '<h3 class="widget-title">',
 								'after_title'  => '</h3>',
 							)
diff --git a/wp-content/themes/twentyeleven/sidebar-page.php b/wp-content/themes/twentyeleven/sidebar-page.php
index 032bc06021..a12f1a233f 100644
--- a/wp-content/themes/twentyeleven/sidebar-page.php
+++ b/wp-content/themes/twentyeleven/sidebar-page.php
@@ -17,7 +17,7 @@ get_header(); ?>
 				<?php
 				while ( have_posts() ) :
 					the_post();
-?>
+					?>
 
 					<?php get_template_part( 'content', 'page' ); ?>
 
diff --git a/wp-content/themes/twentyeleven/sidebar.php b/wp-content/themes/twentyeleven/sidebar.php
index fb53e58b92..67fb7e5f11 100644
--- a/wp-content/themes/twentyeleven/sidebar.php
+++ b/wp-content/themes/twentyeleven/sidebar.php
@@ -11,7 +11,7 @@ $options        = twentyeleven_get_theme_options();
 $current_layout = $options['theme_layout'];
 
 if ( 'content' != $current_layout ) :
-?>
+	?>
 		<div id="secondary" class="widget-area" role="complementary">
 			<?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
 
diff --git a/wp-content/themes/twentyeleven/single.php b/wp-content/themes/twentyeleven/single.php
index 0250e943f9..b1ebd8a674 100644
--- a/wp-content/themes/twentyeleven/single.php
+++ b/wp-content/themes/twentyeleven/single.php
@@ -15,7 +15,7 @@ get_header(); ?>
 				<?php
 				while ( have_posts() ) :
 					the_post();
-?>
+					?>
 
 					<nav id="nav-single">
 						<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
diff --git a/wp-content/themes/twentyeleven/tag.php b/wp-content/themes/twentyeleven/tag.php
index 84bc48e9bc..cec9303747 100644
--- a/wp-content/themes/twentyeleven/tag.php
+++ b/wp-content/themes/twentyeleven/tag.php
@@ -42,7 +42,7 @@ get_header(); ?>
 				<?php
 				while ( have_posts() ) :
 					the_post();
-?>
+					?>
 
 					<?php
 						/*
diff --git a/wp-content/themes/twentyfifteen/comments.php b/wp-content/themes/twentyfifteen/comments.php
index 1c1b5a4964..b7ab478a13 100644
--- a/wp-content/themes/twentyfifteen/comments.php
+++ b/wp-content/themes/twentyfifteen/comments.php
@@ -67,7 +67,7 @@ if ( post_password_required() ) {
 	<?php
 		// If comments are closed and there are comments, let's leave a little note, shall we?
 	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
-	?>
+		?>
 	<p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfifteen' ); ?></p>
 	<?php endif; ?>
 
diff --git a/wp-content/themes/twentyfifteen/content-link.php b/wp-content/themes/twentyfifteen/content-link.php
index 17aaf780a4..f9a3199771 100644
--- a/wp-content/themes/twentyfifteen/content-link.php
+++ b/wp-content/themes/twentyfifteen/content-link.php
@@ -20,7 +20,7 @@
 			else :
 				the_title( sprintf( '<h2 class="entry-title"><a href="%s">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h2>' );
 			endif;
-		?>
+			?>
 	</header>
 	<!-- .entry-header -->
 
@@ -44,7 +44,7 @@
 					'separator'   => '<span class="screen-reader-text">, </span>',
 				)
 			);
-		?>
+			?>
 	</div>
 	<!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyfifteen/content-page.php b/wp-content/themes/twentyfifteen/content-page.php
index 225eaff3fa..5b9e796c03 100644
--- a/wp-content/themes/twentyfifteen/content-page.php
+++ b/wp-content/themes/twentyfifteen/content-page.php
@@ -31,7 +31,7 @@
 					'separator'   => '<span class="screen-reader-text">, </span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer><!-- .entry-footer -->' ); ?>
diff --git a/wp-content/themes/twentyfifteen/content.php b/wp-content/themes/twentyfifteen/content.php
index 5ad1580529..1ac377af47 100644
--- a/wp-content/themes/twentyfifteen/content.php
+++ b/wp-content/themes/twentyfifteen/content.php
@@ -23,7 +23,7 @@
 			else :
 				the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' );
 			endif;
-		?>
+			?>
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
@@ -46,7 +46,7 @@
 					'separator'   => '<span class="screen-reader-text">, </span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<?php
diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php
index 3f678a9b03..2e7465e535 100644
--- a/wp-content/themes/twentyfifteen/functions.php
+++ b/wp-content/themes/twentyfifteen/functions.php
@@ -93,7 +93,8 @@ if ( ! function_exists( 'twentyfifteen_setup' ) ) :
 		 * to output valid HTML5.
 		 */
 		add_theme_support(
-			'html5', array(
+			'html5',
+			array(
 				'search-form',
 				'comment-form',
 				'comment-list',
@@ -108,7 +109,8 @@ if ( ! function_exists( 'twentyfifteen_setup' ) ) :
 		 * See: https://codex.wordpress.org/Post_Formats
 		 */
 		add_theme_support(
-			'post-formats', array(
+			'post-formats',
+			array(
 				'aside',
 				'image',
 				'video',
@@ -127,7 +129,8 @@ if ( ! function_exists( 'twentyfifteen_setup' ) ) :
 		 * @since Twenty Fifteen 1.5
 		 */
 		add_theme_support(
-			'custom-logo', array(
+			'custom-logo',
+			array(
 				'height'      => 248,
 				'width'       => 248,
 				'flex-height' => true,
@@ -152,8 +155,10 @@ if ( ! function_exists( 'twentyfifteen_setup' ) ) :
 		 * }
 		 */
 		add_theme_support(
-			'custom-background', apply_filters(
-				'twentyfifteen_custom_background_args', array(
+			'custom-background',
+			apply_filters(
+				'twentyfifteen_custom_background_args',
+				array(
 					'default-color'      => $default_color,
 					'default-attachment' => 'fixed',
 				)
@@ -252,7 +257,8 @@ if ( ! function_exists( 'twentyfifteen_fonts_url' ) ) :
 				array(
 					'family' => urlencode( implode( '|', $fonts ) ),
 					'subset' => urlencode( $subsets ),
-				), 'https://fonts.googleapis.com/css'
+				),
+				'https://fonts.googleapis.com/css'
 			);
 		}
 
@@ -307,7 +313,9 @@ function twentyfifteen_scripts() {
 
 	wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20150330', true );
 	wp_localize_script(
-		'twentyfifteen-script', 'screenReaderText', array(
+		'twentyfifteen-script',
+		'screenReaderText',
+		array(
 			'expand'   => '<span class="screen-reader-text">' . __( 'expand child menu', 'twentyfifteen' ) . '</span>',
 			'collapse' => '<span class="screen-reader-text">' . __( 'collapse child menu', 'twentyfifteen' ) . '</span>',
 		)
diff --git a/wp-content/themes/twentyfifteen/header.php b/wp-content/themes/twentyfifteen/header.php
index a088d85cea..dfb281f342 100644
--- a/wp-content/themes/twentyfifteen/header.php
+++ b/wp-content/themes/twentyfifteen/header.php
@@ -41,11 +41,11 @@
 
 					$description = get_bloginfo( 'description', 'display' );
 if ( $description || is_customize_preview() ) :
-					?>
+	?>
 						<p class="site-description"><?php echo $description; ?></p>
 					<?php
 					endif;
-				?>
+?>
 				<button class="secondary-toggle"><?php _e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
 			</div><!-- .site-branding -->
 		</header><!-- .site-header -->
diff --git a/wp-content/themes/twentyfifteen/image.php b/wp-content/themes/twentyfifteen/image.php
index ed07d05d5a..5afa773f49 100644
--- a/wp-content/themes/twentyfifteen/image.php
+++ b/wp-content/themes/twentyfifteen/image.php
@@ -16,7 +16,7 @@ get_header(); ?>
 				// Start the loop.
 			while ( have_posts() ) :
 				the_post();
-			?>
+				?>
 
 			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
@@ -66,7 +66,7 @@ get_header(); ?>
 								'separator'   => '<span class="screen-reader-text">, </span>',
 							)
 						);
-					?>
+						?>
 					</div><!-- .entry-content -->
 
 					<footer class="entry-footer">
diff --git a/wp-content/themes/twentyfifteen/inc/back-compat.php b/wp-content/themes/twentyfifteen/inc/back-compat.php
index 2f828d6ed2..a4f03e3a68 100644
--- a/wp-content/themes/twentyfifteen/inc/back-compat.php
+++ b/wp-content/themes/twentyfifteen/inc/back-compat.php
@@ -45,7 +45,9 @@ function twentyfifteen_upgrade_notice() {
  */
 function twentyfifteen_customize() {
 	wp_die(
-		sprintf( __( 'Twenty Fifteen requires at least WordPress version 4.1. You are running version %s. Please upgrade and try again.', 'twentyfifteen' ), $GLOBALS['wp_version'] ), '', array(
+		sprintf( __( 'Twenty Fifteen requires at least WordPress version 4.1. You are running version %s. Please upgrade and try again.', 'twentyfifteen' ), $GLOBALS['wp_version'] ),
+		'',
+		array(
 			'back_link' => true,
 		)
 	);
diff --git a/wp-content/themes/twentyfifteen/inc/custom-header.php b/wp-content/themes/twentyfifteen/inc/custom-header.php
index 5f90789fe8..763ef00d03 100644
--- a/wp-content/themes/twentyfifteen/inc/custom-header.php
+++ b/wp-content/themes/twentyfifteen/inc/custom-header.php
@@ -32,8 +32,10 @@ function twentyfifteen_custom_header_setup() {
 	 * }
 	 */
 	add_theme_support(
-		'custom-header', apply_filters(
-			'twentyfifteen_custom_header_args', array(
+		'custom-header',
+		apply_filters(
+			'twentyfifteen_custom_header_args',
+			array(
 				'default-text-color' => $default_text_color,
 				'width'              => 954,
 				'height'             => 1300,
@@ -97,7 +99,7 @@ if ( ! function_exists( 'twentyfifteen_header_style' ) ) :
 		<?php
 		// Short header for when there is no Custom Header and Header Text is hidden.
 		if ( empty( $header_image ) && ! display_header_text() ) :
-	?>
+			?>
 		.site-header {
 			padding-top: 14px;
 			padding-bottom: 14px;
@@ -134,12 +136,12 @@ if ( ! function_exists( 'twentyfifteen_header_style' ) ) :
 				min-height: 0;
 			}
 		}
-	<?php
+			<?php
 		endif;
 
 		// Has a Custom Header been added?
 		if ( ! empty( $header_image ) ) :
-	?>
+			?>
 		.site-header {
 
 			/*
@@ -176,12 +178,12 @@ if ( ! function_exists( 'twentyfifteen_header_style' ) ) :
 				background: transparent;
 			}
 		}
-	<?php
+			<?php
 		endif;
 
 		// Has the text been hidden?
 		if ( ! display_header_text() ) :
-	?>
+			?>
 		.site-title,
 		.site-description {
 			clip: rect(1px, 1px, 1px, 1px);
@@ -189,7 +191,7 @@ if ( ! function_exists( 'twentyfifteen_header_style' ) ) :
 		}
 	<?php endif; ?>
 	</style>
-	<?php
+		<?php
 	}
 endif; // twentyfifteen_header_style
 
diff --git a/wp-content/themes/twentyfifteen/inc/customizer.php b/wp-content/themes/twentyfifteen/inc/customizer.php
index 9cc00a8ab9..3b74f2433f 100644
--- a/wp-content/themes/twentyfifteen/inc/customizer.php
+++ b/wp-content/themes/twentyfifteen/inc/customizer.php
@@ -22,14 +22,16 @@ function twentyfifteen_customize_register( $wp_customize ) {
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
 		$wp_customize->selective_refresh->add_partial(
-			'blogname', array(
+			'blogname',
+			array(
 				'selector'            => '.site-title a',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentyfifteen_customize_partial_blogname',
 			)
 		);
 		$wp_customize->selective_refresh->add_partial(
-			'blogdescription', array(
+			'blogdescription',
+			array(
 				'selector'            => '.site-description',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentyfifteen_customize_partial_blogdescription',
@@ -39,7 +41,8 @@ function twentyfifteen_customize_register( $wp_customize ) {
 
 	// Add color scheme setting and control.
 	$wp_customize->add_setting(
-		'color_scheme', array(
+		'color_scheme',
+		array(
 			'default'           => 'default',
 			'sanitize_callback' => 'twentyfifteen_sanitize_color_scheme',
 			'transport'         => 'postMessage',
@@ -47,7 +50,8 @@ function twentyfifteen_customize_register( $wp_customize ) {
 	);
 
 	$wp_customize->add_control(
-		'color_scheme', array(
+		'color_scheme',
+		array(
 			'label'    => __( 'Base Color Scheme', 'twentyfifteen' ),
 			'section'  => 'colors',
 			'type'     => 'select',
@@ -58,7 +62,8 @@ function twentyfifteen_customize_register( $wp_customize ) {
 
 	// Add custom header and sidebar text color setting and control.
 	$wp_customize->add_setting(
-		'sidebar_textcolor', array(
+		'sidebar_textcolor',
+		array(
 			'default'           => $color_scheme[4],
 			'sanitize_callback' => 'sanitize_hex_color',
 			'transport'         => 'postMessage',
@@ -67,7 +72,9 @@ function twentyfifteen_customize_register( $wp_customize ) {
 
 	$wp_customize->add_control(
 		new WP_Customize_Color_Control(
-			$wp_customize, 'sidebar_textcolor', array(
+			$wp_customize,
+			'sidebar_textcolor',
+			array(
 				'label'       => __( 'Header and Sidebar Text Color', 'twentyfifteen' ),
 				'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
 				'section'     => 'colors',
@@ -80,7 +87,8 @@ function twentyfifteen_customize_register( $wp_customize ) {
 
 	// Add custom header and sidebar background color setting and control.
 	$wp_customize->add_setting(
-		'header_background_color', array(
+		'header_background_color',
+		array(
 			'default'           => $color_scheme[1],
 			'sanitize_callback' => 'sanitize_hex_color',
 			'transport'         => 'postMessage',
@@ -89,7 +97,9 @@ function twentyfifteen_customize_register( $wp_customize ) {
 
 	$wp_customize->add_control(
 		new WP_Customize_Color_Control(
-			$wp_customize, 'header_background_color', array(
+			$wp_customize,
+			'header_background_color',
+			array(
 				'label'       => __( 'Header and Sidebar Background Color', 'twentyfifteen' ),
 				'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
 				'section'     => 'colors',
@@ -166,7 +176,8 @@ function twentyfifteen_get_color_schemes() {
 	 * }
 	 */
 	return apply_filters(
-		'twentyfifteen_color_schemes', array(
+		'twentyfifteen_color_schemes',
+		array(
 			'default' => array(
 				'label'  => __( 'Default', 'twentyfifteen' ),
 				'colors' => array(
@@ -371,7 +382,8 @@ add_action( 'customize_preview_init', 'twentyfifteen_customize_preview_js' );
  */
 function twentyfifteen_get_color_scheme_css( $colors ) {
 	$colors = wp_parse_args(
-		$colors, array(
+		$colors,
+		array(
 			'background_color'            => '',
 			'header_background_color'     => '',
 			'box_background_color'        => '',
diff --git a/wp-content/themes/twentyfifteen/inc/template-tags.php b/wp-content/themes/twentyfifteen/inc/template-tags.php
index baa98d2114..dad54e6cce 100644
--- a/wp-content/themes/twentyfifteen/inc/template-tags.php
+++ b/wp-content/themes/twentyfifteen/inc/template-tags.php
@@ -18,7 +18,7 @@ if ( ! function_exists( 'twentyfifteen_comment_nav' ) ) :
 	function twentyfifteen_comment_nav() {
 		// Are there comments to navigate through?
 		if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
-		?>
+			?>
 		<nav class="navigation comment-navigation" role="navigation">
 		<h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfifteen' ); ?></h2>
 		<div class="nav-links">
@@ -33,7 +33,7 @@ if ( ! function_exists( 'twentyfifteen_comment_nav' ) ) :
 			?>
 			</div><!-- .nav-links -->
 		</nav><!-- .comment-navigation -->
-		<?php
+			<?php
 		endif;
 	}
 endif;
@@ -195,10 +195,10 @@ if ( ! function_exists( 'twentyfifteen_post_thumbnail' ) ) :
 		}
 
 		if ( is_singular() ) :
-		?>
+			?>
 
 		<div class="post-thumbnail">
-		<?php the_post_thumbnail(); ?>
+			<?php the_post_thumbnail(); ?>
 	</div><!-- .post-thumbnail -->
 
 	<?php else : ?>
diff --git a/wp-content/themes/twentyfifteen/search.php b/wp-content/themes/twentyfifteen/search.php
index 174c9f6f92..f3778f34d8 100644
--- a/wp-content/themes/twentyfifteen/search.php
+++ b/wp-content/themes/twentyfifteen/search.php
@@ -22,7 +22,7 @@ get_header(); ?>
 			// Start the loop.
 			while ( have_posts() ) :
 				the_post();
-			?>
+				?>
 
 				<?php
 				/*
diff --git a/wp-content/themes/twentyfourteen/archive.php b/wp-content/themes/twentyfourteen/archive.php
index e2b4b4145a..cf8b638467 100644
--- a/wp-content/themes/twentyfourteen/archive.php
+++ b/wp-content/themes/twentyfourteen/archive.php
@@ -40,21 +40,21 @@ get_header(); ?>
 							_e( 'Archives', 'twentyfourteen' );
 
 						endif;
-					?>
+						?>
 				</h1>
 			</header><!-- .page-header -->
 
-			<?php
+				<?php
 					// Start the Loop.
-			while ( have_posts() ) :
-				the_post();
+				while ( have_posts() ) :
+					the_post();
 
-				/*
-				 * Include the post format-specific template for the content. If you want to
-				 * use this in a child theme, then include a file called content-___.php
-				 * (where ___ is the post format) and that will be used instead.
-				 */
-				get_template_part( 'content', get_post_format() );
+					/*
+					 * Include the post format-specific template for the content. If you want to
+					 * use this in a child theme, then include a file called content-___.php
+					 * (where ___ is the post format) and that will be used instead.
+					 */
+					get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next page navigation.
@@ -65,7 +65,7 @@ get_header(); ?>
 					get_template_part( 'content', 'none' );
 
 				endif;
-			?>
+				?>
 		</div><!-- #content -->
 	</section><!-- #primary -->
 
diff --git a/wp-content/themes/twentyfourteen/author.php b/wp-content/themes/twentyfourteen/author.php
index 90a5bc0bf7..91157f6d98 100644
--- a/wp-content/themes/twentyfourteen/author.php
+++ b/wp-content/themes/twentyfourteen/author.php
@@ -36,7 +36,7 @@ get_header(); ?>
 				<?php endif; ?>
 			</header><!-- .archive-header -->
 
-			<?php
+				<?php
 					/*
 					 * Since we called the_post() above, we need to rewind
 					 * the loop back to the beginning that way we can run
@@ -45,15 +45,15 @@ get_header(); ?>
 					rewind_posts();
 
 					// Start the Loop.
-			while ( have_posts() ) :
-				the_post();
+				while ( have_posts() ) :
+					the_post();
 
-				/*
-				 * Include the post format-specific template for the content. If you want to
-				 * use this in a child theme, then include a file called content-___.php
-				 * (where ___ is the post format) and that will be used instead.
-				 */
-				get_template_part( 'content', get_post_format() );
+					/*
+					 * Include the post format-specific template for the content. If you want to
+					 * use this in a child theme, then include a file called content-___.php
+					 * (where ___ is the post format) and that will be used instead.
+					 */
+					get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next page navigation.
@@ -64,7 +64,7 @@ get_header(); ?>
 					get_template_part( 'content', 'none' );
 
 				endif;
-			?>
+				?>
 
 		</div><!-- #content -->
 	</section><!-- #primary -->
diff --git a/wp-content/themes/twentyfourteen/category.php b/wp-content/themes/twentyfourteen/category.php
index 2264c1e30a..f4b2a3b6d1 100644
--- a/wp-content/themes/twentyfourteen/category.php
+++ b/wp-content/themes/twentyfourteen/category.php
@@ -28,17 +28,17 @@ get_header(); ?>
 				?>
 			</header><!-- .archive-header -->
 
-			<?php
+				<?php
 					// Start the Loop.
-			while ( have_posts() ) :
-				the_post();
+				while ( have_posts() ) :
+					the_post();
 
-				/*
-				* Include the post format-specific template for the content. If you want to
-				* use this in a child theme, then include a file called content-___.php
-				* (where ___ is the post format) and that will be used instead.
-				*/
-				get_template_part( 'content', get_post_format() );
+					/*
+					* Include the post format-specific template for the content. If you want to
+					* use this in a child theme, then include a file called content-___.php
+					* (where ___ is the post format) and that will be used instead.
+					*/
+					get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next page navigation.
@@ -49,7 +49,7 @@ get_header(); ?>
 					get_template_part( 'content', 'none' );
 
 				endif;
-			?>
+				?>
 		</div><!-- #content -->
 	</section><!-- #primary -->
 
diff --git a/wp-content/themes/twentyfourteen/comments.php b/wp-content/themes/twentyfourteen/comments.php
index a20dc1ec51..0b81703fef 100644
--- a/wp-content/themes/twentyfourteen/comments.php
+++ b/wp-content/themes/twentyfourteen/comments.php
@@ -45,7 +45,7 @@ if ( post_password_required() ) {
 		?>
 	</h2>
 
-	<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
+		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
 	<nav id="comment-nav-above" class="navigation comment-navigation" role="navigation">
 		<h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfourteen' ); ?></h1>
 		<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyfourteen' ) ); ?></div>
@@ -65,7 +65,7 @@ if ( post_password_required() ) {
 		?>
 	</ol><!-- .comment-list -->
 
-	<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
+		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
 	<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
 		<h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfourteen' ); ?></h1>
 		<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyfourteen' ) ); ?></div>
@@ -73,7 +73,7 @@ if ( post_password_required() ) {
 	</nav><!-- #comment-nav-below -->
 	<?php endif; // Check for comment navigation. ?>
 
-	<?php if ( ! comments_open() ) : ?>
+		<?php if ( ! comments_open() ) : ?>
 	<p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfourteen' ); ?></p>
 	<?php endif; ?>
 
diff --git a/wp-content/themes/twentyfourteen/content-aside.php b/wp-content/themes/twentyfourteen/content-aside.php
index 554416dfea..48d7abca19 100644
--- a/wp-content/themes/twentyfourteen/content-aside.php
+++ b/wp-content/themes/twentyfourteen/content-aside.php
@@ -16,7 +16,7 @@
 		<div class="entry-meta">
 			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
 		</div><!-- .entry-meta -->
-		<?php
+			<?php
 			endif;
 
 if ( is_single() ) :
@@ -24,7 +24,7 @@ if ( is_single() ) :
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
-		?>
+			?>
 
 		<div class="entry-meta">
 			<span class="post-format">
@@ -59,7 +59,7 @@ if ( is_single() ) :
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
diff --git a/wp-content/themes/twentyfourteen/content-audio.php b/wp-content/themes/twentyfourteen/content-audio.php
index 8fc2095ada..c700996a08 100644
--- a/wp-content/themes/twentyfourteen/content-audio.php
+++ b/wp-content/themes/twentyfourteen/content-audio.php
@@ -16,7 +16,7 @@
 		<div class="entry-meta">
 			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
 		</div><!-- .entry-meta -->
-		<?php
+			<?php
 			endif;
 
 if ( is_single() ) :
@@ -24,7 +24,7 @@ if ( is_single() ) :
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
-		?>
+			?>
 
 		<div class="entry-meta">
 			<span class="post-format">
@@ -59,7 +59,7 @@ if ( is_single() ) :
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
diff --git a/wp-content/themes/twentyfourteen/content-gallery.php b/wp-content/themes/twentyfourteen/content-gallery.php
index db382fef7f..e8c252454c 100644
--- a/wp-content/themes/twentyfourteen/content-gallery.php
+++ b/wp-content/themes/twentyfourteen/content-gallery.php
@@ -16,7 +16,7 @@
 		<div class="entry-meta">
 			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
 		</div><!-- .entry-meta -->
-		<?php
+			<?php
 			endif;
 
 if ( is_single() ) :
@@ -24,7 +24,7 @@ if ( is_single() ) :
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
-		?>
+			?>
 
 		<div class="entry-meta">
 			<span class="post-format">
@@ -59,7 +59,7 @@ if ( is_single() ) :
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
diff --git a/wp-content/themes/twentyfourteen/content-image.php b/wp-content/themes/twentyfourteen/content-image.php
index 11aa1e8fd8..70b1e04c09 100644
--- a/wp-content/themes/twentyfourteen/content-image.php
+++ b/wp-content/themes/twentyfourteen/content-image.php
@@ -16,7 +16,7 @@
 		<div class="entry-meta">
 			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
 		</div><!-- .entry-meta -->
-		<?php
+			<?php
 			endif;
 
 if ( is_single() ) :
@@ -24,7 +24,7 @@ if ( is_single() ) :
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
-		?>
+			?>
 
 		<div class="entry-meta">
 			<span class="post-format">
@@ -59,7 +59,7 @@ if ( is_single() ) :
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
diff --git a/wp-content/themes/twentyfourteen/content-link.php b/wp-content/themes/twentyfourteen/content-link.php
index 5c97986315..d51d634c5e 100644
--- a/wp-content/themes/twentyfourteen/content-link.php
+++ b/wp-content/themes/twentyfourteen/content-link.php
@@ -16,7 +16,7 @@
 		<div class="entry-meta">
 			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
 		</div><!-- .entry-meta -->
-		<?php
+			<?php
 			endif;
 
 if ( is_single() ) :
@@ -24,7 +24,7 @@ if ( is_single() ) :
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
-		?>
+			?>
 
 		<div class="entry-meta">
 			<span class="post-format">
@@ -59,7 +59,7 @@ if ( is_single() ) :
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
diff --git a/wp-content/themes/twentyfourteen/content-page.php b/wp-content/themes/twentyfourteen/content-page.php
index 6a33baa706..ca8ebd9bb4 100644
--- a/wp-content/themes/twentyfourteen/content-page.php
+++ b/wp-content/themes/twentyfourteen/content-page.php
@@ -28,6 +28,6 @@
 			);
 
 			edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' );
-		?>
+			?>
 	</div><!-- .entry-content -->
 </article><!-- #post-## -->
diff --git a/wp-content/themes/twentyfourteen/content-quote.php b/wp-content/themes/twentyfourteen/content-quote.php
index fa0b899268..27a7b169ca 100644
--- a/wp-content/themes/twentyfourteen/content-quote.php
+++ b/wp-content/themes/twentyfourteen/content-quote.php
@@ -16,7 +16,7 @@
 		<div class="entry-meta">
 			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
 		</div><!-- .entry-meta -->
-		<?php
+			<?php
 			endif;
 
 if ( is_single() ) :
@@ -24,7 +24,7 @@ if ( is_single() ) :
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
-		?>
+			?>
 
 		<div class="entry-meta">
 			<span class="post-format">
@@ -59,7 +59,7 @@ if ( is_single() ) :
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
diff --git a/wp-content/themes/twentyfourteen/content-video.php b/wp-content/themes/twentyfourteen/content-video.php
index 951a13cffa..13609b64a6 100644
--- a/wp-content/themes/twentyfourteen/content-video.php
+++ b/wp-content/themes/twentyfourteen/content-video.php
@@ -16,7 +16,7 @@
 		<div class="entry-meta">
 			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
 		</div><!-- .entry-meta -->
-		<?php
+			<?php
 			endif;
 
 if ( is_single() ) :
@@ -24,7 +24,7 @@ if ( is_single() ) :
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
-		?>
+			?>
 
 		<div class="entry-meta">
 			<span class="post-format">
@@ -59,7 +59,7 @@ if ( is_single() ) :
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<?php the_tags( '<footer class="entry-meta"><span class="tag-links">', '', '</span></footer>' ); ?>
diff --git a/wp-content/themes/twentyfourteen/content.php b/wp-content/themes/twentyfourteen/content.php
index 03eb3e89dc..2d54fc9aa5 100644
--- a/wp-content/themes/twentyfourteen/content.php
+++ b/wp-content/themes/twentyfourteen/content.php
@@ -18,7 +18,7 @@
 		<div class="entry-meta">
 			<span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
 		</div>
-		<?php
+			<?php
 			endif;
 
 if ( is_single() ) :
@@ -26,7 +26,7 @@ if ( is_single() ) :
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
-		?>
+			?>
 
 		<div class="entry-meta">
 			<?php
@@ -35,9 +35,9 @@ if ( is_single() ) :
 			}
 
 			if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
-			?>
+				?>
 			<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyfourteen' ), __( '1 Comment', 'twentyfourteen' ), __( '% Comments', 'twentyfourteen' ) ); ?></span>
-			<?php
+				<?php
 				endif;
 
 				edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' );
diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php
index 49deb790ba..aaf90f20e6 100644
--- a/wp-content/themes/twentyfourteen/functions.php
+++ b/wp-content/themes/twentyfourteen/functions.php
@@ -91,7 +91,8 @@ if ( ! function_exists( 'twentyfourteen_setup' ) ) :
 		 * to output valid HTML5.
 		 */
 		add_theme_support(
-			'html5', array(
+			'html5',
+			array(
 				'search-form',
 				'comment-form',
 				'comment-list',
@@ -105,7 +106,8 @@ if ( ! function_exists( 'twentyfourteen_setup' ) ) :
 		 * See https://codex.wordpress.org/Post_Formats
 		 */
 		add_theme_support(
-			'post-formats', array(
+			'post-formats',
+			array(
 				'aside',
 				'image',
 				'video',
@@ -118,8 +120,10 @@ if ( ! function_exists( 'twentyfourteen_setup' ) ) :
 
 		// This theme allows users to set a custom background.
 		add_theme_support(
-			'custom-background', apply_filters(
-				'twentyfourteen_custom_background_args', array(
+			'custom-background',
+			apply_filters(
+				'twentyfourteen_custom_background_args',
+				array(
 					'default-color' => 'f5f5f5',
 				)
 			)
@@ -127,7 +131,8 @@ if ( ! function_exists( 'twentyfourteen_setup' ) ) :
 
 		// Add support for featured content.
 		add_theme_support(
-			'featured-content', array(
+			'featured-content',
+			array(
 				'featured_content_filter' => 'twentyfourteen_get_featured_posts',
 				'max_posts'               => 6,
 			)
@@ -286,7 +291,9 @@ function twentyfourteen_scripts() {
 	if ( is_front_page() && 'slider' == get_theme_mod( 'featured_content_layout' ) ) {
 		wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20131205', true );
 		wp_localize_script(
-			'twentyfourteen-slider', 'featuredSliderDefaults', array(
+			'twentyfourteen-slider',
+			'featuredSliderDefaults',
+			array(
 				'prevText' => __( 'Previous', 'twentyfourteen' ),
 				'nextText' => __( 'Next', 'twentyfourteen' ),
 			)
@@ -423,7 +430,7 @@ if ( ! function_exists( 'twentyfourteen_list_authors' ) ) :
 			if ( ! $post_count ) {
 				continue;
 			}
-		?>
+			?>
 
 		<div class="contributor">
 		<div class="contributor-info">
@@ -440,7 +447,7 @@ if ( ! function_exists( 'twentyfourteen_list_authors' ) ) :
 		</div><!-- .contributor-info -->
 	</div><!-- .contributor -->
 
-	<?php
+			<?php
 	endforeach;
 	}
 endif;
diff --git a/wp-content/themes/twentyfourteen/header.php b/wp-content/themes/twentyfourteen/header.php
index 4dec164aee..3207e73574 100644
--- a/wp-content/themes/twentyfourteen/header.php
+++ b/wp-content/themes/twentyfourteen/header.php
@@ -59,7 +59,7 @@
 						'menu_id'        => 'primary-menu',
 					)
 				);
-?>
+				?>
 			</nav>
 		</div>
 
diff --git a/wp-content/themes/twentyfourteen/image.php b/wp-content/themes/twentyfourteen/image.php
index 999800fa2c..f0af8b83bd 100644
--- a/wp-content/themes/twentyfourteen/image.php
+++ b/wp-content/themes/twentyfourteen/image.php
@@ -20,7 +20,7 @@ get_header();
 		// Start the Loop.
 	while ( have_posts() ) :
 		the_post();
-	?>
+		?>
 		<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 			<header class="entry-header">
 				<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
diff --git a/wp-content/themes/twentyfourteen/inc/back-compat.php b/wp-content/themes/twentyfourteen/inc/back-compat.php
index 3943aeefc7..0e8f34b5cd 100644
--- a/wp-content/themes/twentyfourteen/inc/back-compat.php
+++ b/wp-content/themes/twentyfourteen/inc/back-compat.php
@@ -45,7 +45,9 @@ function twentyfourteen_upgrade_notice() {
  */
 function twentyfourteen_customize() {
 	wp_die(
-		sprintf( __( 'Twenty Fourteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentyfourteen' ), $GLOBALS['wp_version'] ), '', array(
+		sprintf( __( 'Twenty Fourteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentyfourteen' ), $GLOBALS['wp_version'] ),
+		'',
+		array(
 			'back_link' => true,
 		)
 	);
diff --git a/wp-content/themes/twentyfourteen/inc/custom-header.php b/wp-content/themes/twentyfourteen/inc/custom-header.php
index bfea8976c1..92382eaa5e 100644
--- a/wp-content/themes/twentyfourteen/inc/custom-header.php
+++ b/wp-content/themes/twentyfourteen/inc/custom-header.php
@@ -36,8 +36,10 @@ function twentyfourteen_custom_header_setup() {
 	 * }
 	 */
 	add_theme_support(
-		'custom-header', apply_filters(
-			'twentyfourteen_custom_header_args', array(
+		'custom-header',
+		apply_filters(
+			'twentyfourteen_custom_header_args',
+			array(
 				'default-text-color'     => 'fff',
 				'width'                  => 1260,
 				'height'                 => 240,
@@ -71,23 +73,23 @@ if ( ! function_exists( 'twentyfourteen_header_style' ) ) :
 		<?php
 		// Has the text been hidden?
 		if ( ! display_header_text() ) :
-	?>
+			?>
 		.site-title,
 		.site-description {
 			clip: rect(1px 1px 1px 1px); /* IE7 */
 			clip: rect(1px, 1px, 1px, 1px);
 			position: absolute;
 		}
-	<?php
-		// If the user has set a custom color for the text, use that.
+			<?php
+			// If the user has set a custom color for the text, use that.
 		elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
-	?>
+			?>
 		.site-title a {
 			color: #<?php echo esc_attr( $text_color ); ?>;
 		}
 	<?php endif; ?>
 	</style>
-	<?php
+		<?php
 	}
 endif; // twentyfourteen_header_style
 
@@ -101,7 +103,7 @@ if ( ! function_exists( 'twentyfourteen_admin_header_style' ) ) :
 	 * @since Twenty Fourteen 1.0
 	 */
 	function twentyfourteen_admin_header_style() {
-	?>
+		?>
 	<style type="text/css" id="twentyfourteen-admin-header-css">
 	.appearance_page_custom-header #headimg {
 		background-color: #000;
@@ -126,7 +128,7 @@ if ( ! function_exists( 'twentyfourteen_admin_header_style' ) ) :
 		vertical-align: middle;
 	}
 	</style>
-	<?php
+		<?php
 	}
 endif; // twentyfourteen_admin_header_style
 
@@ -139,13 +141,13 @@ if ( ! function_exists( 'twentyfourteen_admin_header_image' ) ) :
 	 * @since Twenty Fourteen 1.0
 	 */
 	function twentyfourteen_admin_header_image() {
-	?>
+		?>
 	<div id="headimg">
 		<?php if ( get_header_image() ) : ?>
 		<img src="<?php header_image(); ?>" alt="">
 		<?php endif; ?>
 		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( sprintf( 'color: #%s;', get_header_textcolor() ) ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 	</div>
-<?php
+		<?php
 	}
 endif; // twentyfourteen_admin_header_image
diff --git a/wp-content/themes/twentyfourteen/inc/customizer.php b/wp-content/themes/twentyfourteen/inc/customizer.php
index 5a41f188da..153140939e 100644
--- a/wp-content/themes/twentyfourteen/inc/customizer.php
+++ b/wp-content/themes/twentyfourteen/inc/customizer.php
@@ -22,14 +22,16 @@ function twentyfourteen_customize_register( $wp_customize ) {
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
 		$wp_customize->selective_refresh->add_partial(
-			'blogname', array(
+			'blogname',
+			array(
 				'selector'            => '.site-title a',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentyfourteen_customize_partial_blogname',
 			)
 		);
 		$wp_customize->selective_refresh->add_partial(
-			'blogdescription', array(
+			'blogdescription',
+			array(
 				'selector'            => '.site-description',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentyfourteen_customize_partial_blogdescription',
@@ -54,7 +56,8 @@ function twentyfourteen_customize_register( $wp_customize ) {
 
 	// Add the featured content section in case it's not already there.
 	$wp_customize->add_section(
-		'featured_content', array(
+		'featured_content',
+		array(
 			'title'           => __( 'Featured Content', 'twentyfourteen' ),
 			'description'     => sprintf(
 				__( 'Use a <a href="%1$s">tag</a> to feature your posts. If no posts match the tag, <a href="%2$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ),
@@ -68,14 +71,16 @@ function twentyfourteen_customize_register( $wp_customize ) {
 
 	// Add the featured content layout setting and control.
 	$wp_customize->add_setting(
-		'featured_content_layout', array(
+		'featured_content_layout',
+		array(
 			'default'           => 'grid',
 			'sanitize_callback' => 'twentyfourteen_sanitize_layout',
 		)
 	);
 
 	$wp_customize->add_control(
-		'featured_content_layout', array(
+		'featured_content_layout',
+		array(
 			'label'   => __( 'Layout', 'twentyfourteen' ),
 			'section' => 'featured_content',
 			'type'    => 'select',
diff --git a/wp-content/themes/twentyfourteen/inc/featured-content.php b/wp-content/themes/twentyfourteen/inc/featured-content.php
index 808a8a7432..23fb38d714 100644
--- a/wp-content/themes/twentyfourteen/inc/featured-content.php
+++ b/wp-content/themes/twentyfourteen/inc/featured-content.php
@@ -376,7 +376,8 @@ class Featured_Content {
 	 */
 	public static function customize_register( $wp_customize ) {
 		$wp_customize->add_section(
-			'featured_content', array(
+			'featured_content',
+			array(
 				'title'          => __( 'Featured Content', 'twentyfourteen' ),
 				'description'    => sprintf(
 					__( 'Use a <a href="%1$s">tag</a> to feature your posts. If no posts match the tag, <a href="%2$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ),
@@ -390,14 +391,16 @@ class Featured_Content {
 
 		// Add Featured Content settings.
 		$wp_customize->add_setting(
-			'featured-content[tag-name]', array(
+			'featured-content[tag-name]',
+			array(
 				'default'              => _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ),
 				'type'                 => 'option',
 				'sanitize_js_callback' => array( __CLASS__, 'delete_transient' ),
 			)
 		);
 		$wp_customize->add_setting(
-			'featured-content[hide-tag]', array(
+			'featured-content[hide-tag]',
+			array(
 				'default'              => true,
 				'type'                 => 'option',
 				'sanitize_js_callback' => array( __CLASS__, 'delete_transient' ),
@@ -406,14 +409,16 @@ class Featured_Content {
 
 		// Add Featured Content controls.
 		$wp_customize->add_control(
-			'featured-content[tag-name]', array(
+			'featured-content[tag-name]',
+			array(
 				'label'    => __( 'Tag Name', 'twentyfourteen' ),
 				'section'  => 'featured_content',
 				'priority' => 20,
 			)
 		);
 		$wp_customize->add_control(
-			'featured-content[hide-tag]', array(
+			'featured-content[hide-tag]',
+			array(
 				'label'    => __( 'Don&rsquo;t display tag on front end.', 'twentyfourteen' ),
 				'section'  => 'featured_content',
 				'type'     => 'checkbox',
diff --git a/wp-content/themes/twentyfourteen/inc/template-tags.php b/wp-content/themes/twentyfourteen/inc/template-tags.php
index 893933164f..cf5debfa4b 100644
--- a/wp-content/themes/twentyfourteen/inc/template-tags.php
+++ b/wp-content/themes/twentyfourteen/inc/template-tags.php
@@ -55,14 +55,14 @@ if ( ! function_exists( 'twentyfourteen_paging_nav' ) ) :
 
 		if ( $links ) :
 
-		?>
+			?>
 		<nav class="navigation paging-navigation" role="navigation">
 		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentyfourteen' ); ?></h1>
 		<div class="pagination loop-pagination">
 			<?php echo $links; ?>
 		</div><!-- .pagination -->
 	</nav><!-- .navigation -->
-	<?php
+			<?php
 	endif;
 	}
 endif;
@@ -182,16 +182,16 @@ if ( ! function_exists( 'twentyfourteen_post_thumbnail' ) ) :
 		}
 
 		if ( is_singular() ) :
-		?>
+			?>
 
 		<div class="post-thumbnail">
-		<?php
-		if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
-			the_post_thumbnail( 'twentyfourteen-full-width' );
-		} else {
-			the_post_thumbnail();
-		}
-		?>
+			<?php
+			if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
+				the_post_thumbnail( 'twentyfourteen-full-width' );
+			} else {
+				the_post_thumbnail();
+			}
+			?>
 		</div>
 
 		<?php else : ?>
diff --git a/wp-content/themes/twentyfourteen/inc/widgets.php b/wp-content/themes/twentyfourteen/inc/widgets.php
index 64118b5e26..7ddabec386 100644
--- a/wp-content/themes/twentyfourteen/inc/widgets.php
+++ b/wp-content/themes/twentyfourteen/inc/widgets.php
@@ -31,7 +31,9 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
 	 */
 	public function __construct() {
 		parent::__construct(
-			'widget_twentyfourteen_ephemera', __( 'Twenty Fourteen Ephemera', 'twentyfourteen' ), array(
+			'widget_twentyfourteen_ephemera',
+			__( 'Twenty Fourteen Ephemera', 'twentyfourteen' ),
+			array(
 				'classname'                   => 'widget_twentyfourteen_ephemera',
 				'description'                 => __( 'Use this widget to list your recent Aside, Quote, Video, Audio, Image, Gallery, and Link posts.', 'twentyfourteen' ),
 				'customize_selective_refresh' => true,
@@ -140,7 +142,7 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
 					$ephemera->the_post();
 					$tmp_more        = $GLOBALS['more'];
 					$GLOBALS['more'] = 0;
-				?>
+					?>
 				<li>
 				<article <?php post_class(); ?>>
 				<div class="entry-content">
@@ -181,25 +183,25 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
 									endif;
 
 									if ( ! empty( $post_thumbnail ) ) :
-						?>
+										?>
 						<a href="<?php the_permalink(); ?>"><?php echo $post_thumbnail; ?></a>
 						<?php endif; ?>
 						<p class="wp-caption-text">
-						<?php
-							printf(
-								_n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
-								esc_url( get_permalink() ),
-								number_format_i18n( $total_images )
-							);
-						?>
+								<?php
+								printf(
+									_n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
+									esc_url( get_permalink() ),
+									number_format_i18n( $total_images )
+								);
+								?>
 						</p>
-						<?php
+								<?php
 						endif;
 
 							else :
 								the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
 							endif;
-						?>
+							?>
 					</div><!-- .entry-content -->
 
 					<header class="entry-header">
diff --git a/wp-content/themes/twentyfourteen/index.php b/wp-content/themes/twentyfourteen/index.php
index 42064cfe86..0c3d5e9b12 100644
--- a/wp-content/themes/twentyfourteen/index.php
+++ b/wp-content/themes/twentyfourteen/index.php
@@ -50,7 +50,7 @@ if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
 				get_template_part( 'content', 'none' );
 
 			endif;
-		?>
+			?>
 
 		</div><!-- #content -->
 	</div><!-- #primary -->
diff --git a/wp-content/themes/twentyfourteen/page-templates/contributors.php b/wp-content/themes/twentyfourteen/page-templates/contributors.php
index b4103e8a2b..6b1d19dbff 100644
--- a/wp-content/themes/twentyfourteen/page-templates/contributors.php
+++ b/wp-content/themes/twentyfourteen/page-templates/contributors.php
@@ -24,24 +24,24 @@ if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
 				// Start the Loop.
 			while ( have_posts() ) :
 				the_post();
-			?>
+				?>
 
 			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-			<?php
+				<?php
 				the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
 
 				// Output the authors list.
 				twentyfourteen_list_authors();
 
 				edit_post_link( __( 'Edit', 'twentyfourteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' );
-			?>
+				?>
 			</article><!-- #post-## -->
 
-			<?php
+				<?php
 				// If comments are open or we have at least one comment, load up the comment template.
-			if ( comments_open() || get_comments_number() ) {
-				comments_template();
-			}
+				if ( comments_open() || get_comments_number() ) {
+					comments_template();
+				}
 				endwhile;
 			?>
 		</div><!-- #content -->
diff --git a/wp-content/themes/twentyfourteen/search.php b/wp-content/themes/twentyfourteen/search.php
index 6945c40a5f..6b20315aad 100644
--- a/wp-content/themes/twentyfourteen/search.php
+++ b/wp-content/themes/twentyfourteen/search.php
@@ -39,7 +39,7 @@ get_header(); ?>
 					get_template_part( 'content', 'none' );
 
 				endif;
-			?>
+				?>
 
 		</div><!-- #content -->
 	</section><!-- #primary -->
diff --git a/wp-content/themes/twentyfourteen/sidebar.php b/wp-content/themes/twentyfourteen/sidebar.php
index 6117b7f570..60800ffeac 100644
--- a/wp-content/themes/twentyfourteen/sidebar.php
+++ b/wp-content/themes/twentyfourteen/sidebar.php
@@ -11,7 +11,7 @@
 	<?php
 		$description = get_bloginfo( 'description', 'display' );
 	if ( ! empty( $description ) ) :
-	?>
+		?>
 	<h2 class="site-description"><?php echo esc_html( $description ); ?></h2>
 	<?php endif; ?>
 
diff --git a/wp-content/themes/twentyfourteen/tag.php b/wp-content/themes/twentyfourteen/tag.php
index 663fe5e9f0..2f1a54f8da 100644
--- a/wp-content/themes/twentyfourteen/tag.php
+++ b/wp-content/themes/twentyfourteen/tag.php
@@ -30,17 +30,17 @@ get_header(); ?>
 				?>
 			</header><!-- .archive-header -->
 
-			<?php
+				<?php
 					// Start the Loop.
-			while ( have_posts() ) :
-				the_post();
+				while ( have_posts() ) :
+					the_post();
 
-				/*
-				 * Include the post format-specific template for the content. If you want to
-				 * use this in a child theme, then include a file called content-___.php
-				 * (where ___ is the post format) and that will be used instead.
-				 */
-				get_template_part( 'content', get_post_format() );
+					/*
+					 * Include the post format-specific template for the content. If you want to
+					 * use this in a child theme, then include a file called content-___.php
+					 * (where ___ is the post format) and that will be used instead.
+					 */
+					get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next page navigation.
@@ -51,7 +51,7 @@ get_header(); ?>
 					get_template_part( 'content', 'none' );
 
 				endif;
-			?>
+				?>
 		</div><!-- #content -->
 	</section><!-- #primary -->
 
diff --git a/wp-content/themes/twentyfourteen/taxonomy-post_format.php b/wp-content/themes/twentyfourteen/taxonomy-post_format.php
index fa7335053c..a6f60c5f5f 100644
--- a/wp-content/themes/twentyfourteen/taxonomy-post_format.php
+++ b/wp-content/themes/twentyfourteen/taxonomy-post_format.php
@@ -51,21 +51,21 @@ get_header(); ?>
 							_e( 'Archives', 'twentyfourteen' );
 
 						endif;
-					?>
+						?>
 				</h1>
 			</header><!-- .archive-header -->
 
-			<?php
+				<?php
 					// Start the Loop.
-			while ( have_posts() ) :
-				the_post();
+				while ( have_posts() ) :
+					the_post();
 
-				/*
-				 * Include the post format-specific template for the content. If you want to
-				 * use this in a child theme, then include a file called content-___.php
-				 * (where ___ is the post format) and that will be used instead.
-				 */
-				get_template_part( 'content', get_post_format() );
+					/*
+					 * Include the post format-specific template for the content. If you want to
+					 * use this in a child theme, then include a file called content-___.php
+					 * (where ___ is the post format) and that will be used instead.
+					 */
+					get_template_part( 'content', get_post_format() );
 
 					endwhile;
 					// Previous/next page navigation.
@@ -76,7 +76,7 @@ get_header(); ?>
 					get_template_part( 'content', 'none' );
 
 				endif;
-			?>
+				?>
 		</div><!-- #content -->
 	</section><!-- #primary -->
 
diff --git a/wp-content/themes/twentyseventeen/archive.php b/wp-content/themes/twentyseventeen/archive.php
index 5a024347ac..7ea0ee0a94 100644
--- a/wp-content/themes/twentyseventeen/archive.php
+++ b/wp-content/themes/twentyseventeen/archive.php
@@ -28,7 +28,7 @@ get_header(); ?>
 
 		<?php
 		if ( have_posts() ) :
-		?>
+			?>
 			<?php
 			/* Start the Loop */
 			while ( have_posts() ) :
diff --git a/wp-content/themes/twentyseventeen/comments.php b/wp-content/themes/twentyseventeen/comments.php
index a8c8f287ae..b61c5ce684 100644
--- a/wp-content/themes/twentyseventeen/comments.php
+++ b/wp-content/themes/twentyseventeen/comments.php
@@ -28,7 +28,7 @@ if ( post_password_required() ) {
 	<?php
 	// You can start editing here -- including this comment!
 	if ( have_comments() ) :
-	?>
+		?>
 		<h2 class="comments-title">
 			<?php
 			$comments_number = get_comments_number();
@@ -77,10 +77,10 @@ if ( post_password_required() ) {
 
 	// If comments are closed and there are comments, let's leave a little note, shall we?
 	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
-	?>
+		?>
 
 		<p class="no-comments"><?php _e( 'Comments are closed.', 'twentyseventeen' ); ?></p>
-	<?php
+		<?php
 	endif;
 
 	comment_form();
diff --git a/wp-content/themes/twentyseventeen/footer.php b/wp-content/themes/twentyseventeen/footer.php
index 8d8086fff5..bc6ce08bf3 100644
--- a/wp-content/themes/twentyseventeen/footer.php
+++ b/wp-content/themes/twentyseventeen/footer.php
@@ -22,7 +22,7 @@
 				get_template_part( 'template-parts/footer/footer', 'widgets' );
 
 				if ( has_nav_menu( 'social' ) ) :
-				?>
+					?>
 					<nav class="social-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Footer Social Links Menu', 'twentyseventeen' ); ?>">
 						<?php
 							wp_nav_menu(
@@ -36,7 +36,7 @@
 							);
 						?>
 					</nav><!-- .social-navigation -->
-				<?php
+					<?php
 				endif;
 
 				get_template_part( 'template-parts/footer/site', 'info' );
diff --git a/wp-content/themes/twentyseventeen/front-page.php b/wp-content/themes/twentyseventeen/front-page.php
index 460c942ac9..86662f4593 100644
--- a/wp-content/themes/twentyseventeen/front-page.php
+++ b/wp-content/themes/twentyseventeen/front-page.php
@@ -50,7 +50,7 @@ get_header(); ?>
 			}
 
 	endif; // The if ( 0 !== twentyseventeen_panel_count() ) ends here.
-	?>
+		?>
 
 	</main><!-- #main -->
 </div><!-- #primary -->
diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php
index 2e147a92da..f9152d55cd 100644
--- a/wp-content/themes/twentyseventeen/functions.php
+++ b/wp-content/themes/twentyseventeen/functions.php
@@ -71,7 +71,8 @@ function twentyseventeen_setup() {
 	 * to output valid HTML5.
 	 */
 	add_theme_support(
-		'html5', array(
+		'html5',
+		array(
 			'comment-form',
 			'comment-list',
 			'gallery',
@@ -85,7 +86,8 @@ function twentyseventeen_setup() {
 	 * See: https://codex.wordpress.org/Post_Formats
 	 */
 	add_theme_support(
-		'post-formats', array(
+		'post-formats',
+		array(
 			'aside',
 			'image',
 			'video',
@@ -98,7 +100,8 @@ function twentyseventeen_setup() {
 
 	// Add theme support for Custom Logo.
 	add_theme_support(
-		'custom-logo', array(
+		'custom-logo',
+		array(
 			'width'      => 250,
 			'height'     => 250,
 			'flex-width' => true,
@@ -418,11 +421,11 @@ function twentyseventeen_colors_css_wrap() {
 	if ( is_customize_preview() ) {
 		$customize_preview_data_hue = 'data-hue="' . $hue . '"';
 	}
-?>
+	?>
 	<style type="text/css" id="custom-theme-colors" <?php echo $customize_preview_data_hue; ?>>
 		<?php echo twentyseventeen_custom_colors_css(); ?>
 	</style>
-<?php
+	<?php
 }
 add_action( 'wp_head', 'twentyseventeen_colors_css_wrap' );
 
diff --git a/wp-content/themes/twentyseventeen/inc/back-compat.php b/wp-content/themes/twentyseventeen/inc/back-compat.php
index fad87f91ba..3bb3ccf7ef 100644
--- a/wp-content/themes/twentyseventeen/inc/back-compat.php
+++ b/wp-content/themes/twentyseventeen/inc/back-compat.php
@@ -49,7 +49,9 @@ function twentyseventeen_upgrade_notice() {
  */
 function twentyseventeen_customize() {
 	wp_die(
-		sprintf( __( 'Twenty Seventeen requires at least WordPress version 4.7. You are running version %s. Please upgrade and try again.', 'twentyseventeen' ), $GLOBALS['wp_version'] ), '', array(
+		sprintf( __( 'Twenty Seventeen requires at least WordPress version 4.7. You are running version %s. Please upgrade and try again.', 'twentyseventeen' ), $GLOBALS['wp_version'] ),
+		'',
+		array(
 			'back_link' => true,
 		)
 	);
diff --git a/wp-content/themes/twentyseventeen/inc/custom-header.php b/wp-content/themes/twentyseventeen/inc/custom-header.php
index 1cc6114a98..00490a7a6b 100644
--- a/wp-content/themes/twentyseventeen/inc/custom-header.php
+++ b/wp-content/themes/twentyseventeen/inc/custom-header.php
@@ -34,8 +34,10 @@ function twentyseventeen_custom_header_setup() {
 	 * }
 	 */
 	add_theme_support(
-		'custom-header', apply_filters(
-			'twentyseventeen_custom_header_args', array(
+		'custom-header',
+		apply_filters(
+			'twentyseventeen_custom_header_args',
+			array(
 				'default-image'    => get_parent_theme_file_uri( '/assets/images/header.jpg' ),
 				'width'            => 2000,
 				'height'           => 1200,
@@ -79,16 +81,16 @@ if ( ! function_exists( 'twentyseventeen_header_style' ) ) :
 		<?php
 		// Has the text been hidden?
 		if ( 'blank' === $header_text_color ) :
-	?>
+			?>
 		.site-title,
 		.site-description {
 			position: absolute;
 			clip: rect(1px, 1px, 1px, 1px);
 		}
-	<?php
-		// If the user has set a custom color for the text use that.
+			<?php
+			// If the user has set a custom color for the text use that.
 		else :
-	?>
+			?>
 		.site-title a,
 		.colors-dark .site-title a,
 		.colors-custom .site-title a,
@@ -111,7 +113,7 @@ if ( ! function_exists( 'twentyseventeen_header_style' ) ) :
 		}
 	<?php endif; ?>
 	</style>
-	<?php
+		<?php
 	}
 endif; // End of twentyseventeen_header_style.
 
diff --git a/wp-content/themes/twentyseventeen/inc/customizer.php b/wp-content/themes/twentyseventeen/inc/customizer.php
index abc27fb057..1dbfb95b79 100644
--- a/wp-content/themes/twentyseventeen/inc/customizer.php
+++ b/wp-content/themes/twentyseventeen/inc/customizer.php
@@ -18,13 +18,15 @@ function twentyseventeen_customize_register( $wp_customize ) {
 	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 
 	$wp_customize->selective_refresh->add_partial(
-		'blogname', array(
+		'blogname',
+		array(
 			'selector'        => '.site-title a',
 			'render_callback' => 'twentyseventeen_customize_partial_blogname',
 		)
 	);
 	$wp_customize->selective_refresh->add_partial(
-		'blogdescription', array(
+		'blogdescription',
+		array(
 			'selector'        => '.site-description',
 			'render_callback' => 'twentyseventeen_customize_partial_blogdescription',
 		)
@@ -34,7 +36,8 @@ function twentyseventeen_customize_register( $wp_customize ) {
 	 * Custom colors.
 	 */
 	$wp_customize->add_setting(
-		'colorscheme', array(
+		'colorscheme',
+		array(
 			'default'           => 'light',
 			'transport'         => 'postMessage',
 			'sanitize_callback' => 'twentyseventeen_sanitize_colorscheme',
@@ -42,7 +45,8 @@ function twentyseventeen_customize_register( $wp_customize ) {
 	);
 
 	$wp_customize->add_setting(
-		'colorscheme_hue', array(
+		'colorscheme_hue',
+		array(
 			'default'           => 250,
 			'transport'         => 'postMessage',
 			'sanitize_callback' => 'absint', // The hue is stored as a positive integer.
@@ -50,7 +54,8 @@ function twentyseventeen_customize_register( $wp_customize ) {
 	);
 
 	$wp_customize->add_control(
-		'colorscheme', array(
+		'colorscheme',
+		array(
 			'type'     => 'radio',
 			'label'    => __( 'Color Scheme', 'twentyseventeen' ),
 			'choices'  => array(
@@ -65,7 +70,9 @@ function twentyseventeen_customize_register( $wp_customize ) {
 
 	$wp_customize->add_control(
 		new WP_Customize_Color_Control(
-			$wp_customize, 'colorscheme_hue', array(
+			$wp_customize,
+			'colorscheme_hue',
+			array(
 				'mode'     => 'hue',
 				'section'  => 'colors',
 				'priority' => 6,
@@ -77,14 +84,16 @@ function twentyseventeen_customize_register( $wp_customize ) {
 	 * Theme options.
 	 */
 	$wp_customize->add_section(
-		'theme_options', array(
+		'theme_options',
+		array(
 			'title'    => __( 'Theme Options', 'twentyseventeen' ),
 			'priority' => 130, // Before Additional CSS.
 		)
 	);
 
 	$wp_customize->add_setting(
-		'page_layout', array(
+		'page_layout',
+		array(
 			'default'           => 'two-column',
 			'sanitize_callback' => 'twentyseventeen_sanitize_page_layout',
 			'transport'         => 'postMessage',
@@ -92,7 +101,8 @@ function twentyseventeen_customize_register( $wp_customize ) {
 	);
 
 	$wp_customize->add_control(
-		'page_layout', array(
+		'page_layout',
+		array(
 			'label'           => __( 'Page Layout', 'twentyseventeen' ),
 			'section'         => 'theme_options',
 			'type'            => 'radio',
@@ -117,7 +127,8 @@ function twentyseventeen_customize_register( $wp_customize ) {
 	// Create a setting and control for each of the sections available in the theme.
 	for ( $i = 1; $i < ( 1 + $num_sections ); $i++ ) {
 		$wp_customize->add_setting(
-			'panel_' . $i, array(
+			'panel_' . $i,
+			array(
 				'default'           => false,
 				'sanitize_callback' => 'absint',
 				'transport'         => 'postMessage',
@@ -125,7 +136,8 @@ function twentyseventeen_customize_register( $wp_customize ) {
 		);
 
 		$wp_customize->add_control(
-			'panel_' . $i, array(
+			'panel_' . $i,
+			array(
 				/* translators: %d is the front page section number */
 				'label'           => sprintf( __( 'Front Page Section %d Content', 'twentyseventeen' ), $i ),
 				'description'     => ( 1 !== $i ? '' : __( 'Select pages to feature in each area from the dropdowns. Add an image to a section by setting a featured image in the page editor. Empty sections will not be displayed.', 'twentyseventeen' ) ),
@@ -137,7 +149,8 @@ function twentyseventeen_customize_register( $wp_customize ) {
 		);
 
 		$wp_customize->selective_refresh->add_partial(
-			'panel_' . $i, array(
+			'panel_' . $i,
+			array(
 				'selector'            => '#panel' . $i,
 				'render_callback'     => 'twentyseventeen_front_page_section',
 				'container_inclusive' => true,
diff --git a/wp-content/themes/twentyseventeen/search.php b/wp-content/themes/twentyseventeen/search.php
index c2a6527467..e05f85d305 100644
--- a/wp-content/themes/twentyseventeen/search.php
+++ b/wp-content/themes/twentyseventeen/search.php
@@ -49,7 +49,7 @@ get_header(); ?>
 			);
 
 		else :
-		?>
+			?>
 
 			<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyseventeen' ); ?></p>
 			<?php
diff --git a/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php b/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php
index e27e7c6417..ea309d8e38 100644
--- a/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php
+++ b/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php
@@ -13,19 +13,19 @@
 <?php
 if ( is_active_sidebar( 'sidebar-2' ) ||
 	is_active_sidebar( 'sidebar-3' ) ) :
-?>
+	?>
 
 	<aside class="widget-area" role="complementary" aria-label="<?php esc_attr_e( 'Footer', 'twentyseventeen' ); ?>">
 		<?php
 		if ( is_active_sidebar( 'sidebar-2' ) ) {
-		?>
+			?>
 			<div class="widget-column footer-widget-1">
 				<?php dynamic_sidebar( 'sidebar-2' ); ?>
 			</div>
-		<?php
+			<?php
 		}
 		if ( is_active_sidebar( 'sidebar-3' ) ) {
-		?>
+			?>
 			<div class="widget-column footer-widget-2">
 				<?php dynamic_sidebar( 'sidebar-3' ); ?>
 			</div>
diff --git a/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php b/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
index 27979e2a3d..02017d5f36 100644
--- a/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
+++ b/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
@@ -25,7 +25,7 @@
 			$description = get_bloginfo( 'description', 'display' );
 
 			if ( $description || is_customize_preview() ) :
-			?>
+				?>
 				<p class="site-description"><?php echo $description; ?></p>
 			<?php endif; ?>
 		</div><!-- .site-branding-text -->
diff --git a/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php b/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php
index 2fcd59f7b4..b1bf883926 100644
--- a/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php
+++ b/wp-content/themes/twentyseventeen/template-parts/page/content-front-page-panels.php
@@ -46,13 +46,13 @@ global $twentyseventeencounter;
 							get_the_title()
 						)
 					);
-				?>
+					?>
 			</div><!-- .entry-content -->
 
 			<?php
 			// Show recent blog posts if is blog posts page (Note that get_option returns a string, so we're casting the result as an int).
 			if ( get_the_ID() === (int) get_option( 'page_for_posts' ) ) :
-			?>
+				?>
 
 				<?php
 				// Show three most recent posts.
diff --git a/wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php b/wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php
index a745c950d3..3b321a5bba 100644
--- a/wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php
+++ b/wp-content/themes/twentyseventeen/template-parts/page/content-front-page.php
@@ -43,7 +43,7 @@
 							get_the_title()
 						)
 					);
-				?>
+					?>
 			</div><!-- .entry-content -->
 
 		</div><!-- .wrap -->
diff --git a/wp-content/themes/twentyseventeen/template-parts/page/content-page.php b/wp-content/themes/twentyseventeen/template-parts/page/content-page.php
index cc054a0885..00e0295dfa 100644
--- a/wp-content/themes/twentyseventeen/template-parts/page/content-page.php
+++ b/wp-content/themes/twentyseventeen/template-parts/page/content-page.php
@@ -27,6 +27,6 @@
 					'after'  => '</div>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 </article><!-- #post-## -->
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-none.php b/wp-content/themes/twentyseventeen/template-parts/post/content-none.php
index 9654c1e974..d3ff3eb081 100644
--- a/wp-content/themes/twentyseventeen/template-parts/post/content-none.php
+++ b/wp-content/themes/twentyseventeen/template-parts/post/content-none.php
@@ -19,7 +19,7 @@
 	<div class="page-content">
 		<?php
 		if ( is_home() && current_user_can( 'publish_posts' ) ) :
-		?>
+			?>
 
 			<p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'twentyseventeen' ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>
 
@@ -30,6 +30,6 @@
 				get_search_form();
 
 		endif;
-		?>
+?>
 	</div><!-- .page-content -->
 </section><!-- .no-results -->
diff --git a/wp-content/themes/twentysixteen/comments.php b/wp-content/themes/twentysixteen/comments.php
index 95dd5651e3..a0a29d577a 100644
--- a/wp-content/themes/twentysixteen/comments.php
+++ b/wp-content/themes/twentysixteen/comments.php
@@ -67,7 +67,7 @@ if ( post_password_required() ) {
 	<?php
 		// If comments are closed and there are comments, let's leave a little note, shall we?
 	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
-	?>
+		?>
 	<p class="no-comments"><?php _e( 'Comments are closed.', 'twentysixteen' ); ?></p>
 	<?php endif; ?>
 
@@ -78,6 +78,6 @@ if ( post_password_required() ) {
 				'title_reply_after'  => '</h2>',
 			)
 		);
-	?>
+		?>
 
 </div><!-- .comments-area -->
diff --git a/wp-content/themes/twentysixteen/functions.php b/wp-content/themes/twentysixteen/functions.php
index 3e675eafb8..676328e041 100644
--- a/wp-content/themes/twentysixteen/functions.php
+++ b/wp-content/themes/twentysixteen/functions.php
@@ -70,7 +70,8 @@ if ( ! function_exists( 'twentysixteen_setup' ) ) :
 		 *  @since Twenty Sixteen 1.2
 		 */
 		add_theme_support(
-			'custom-logo', array(
+			'custom-logo',
+			array(
 				'height'      => 240,
 				'width'       => 240,
 				'flex-height' => true,
@@ -98,7 +99,8 @@ if ( ! function_exists( 'twentysixteen_setup' ) ) :
 		 * to output valid HTML5.
 		 */
 		add_theme_support(
-			'html5', array(
+			'html5',
+			array(
 				'search-form',
 				'comment-form',
 				'comment-list',
@@ -113,7 +115,8 @@ if ( ! function_exists( 'twentysixteen_setup' ) ) :
 		 * See: https://codex.wordpress.org/Post_Formats
 		 */
 		add_theme_support(
-			'post-formats', array(
+			'post-formats',
+			array(
 				'aside',
 				'image',
 				'video',
@@ -233,7 +236,8 @@ if ( ! function_exists( 'twentysixteen_fonts_url' ) ) :
 				array(
 					'family' => urlencode( implode( '|', $fonts ) ),
 					'subset' => urlencode( $subsets ),
-				), 'https://fonts.googleapis.com/css'
+				),
+				'https://fonts.googleapis.com/css'
 			);
 		}
 
@@ -297,7 +301,9 @@ function twentysixteen_scripts() {
 	wp_enqueue_script( 'twentysixteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20160816', true );
 
 	wp_localize_script(
-		'twentysixteen-script', 'screenReaderText', array(
+		'twentysixteen-script',
+		'screenReaderText',
+		array(
 			'expand'   => __( 'expand child menu', 'twentysixteen' ),
 			'collapse' => __( 'collapse child menu', 'twentysixteen' ),
 		)
diff --git a/wp-content/themes/twentysixteen/header.php b/wp-content/themes/twentysixteen/header.php
index 9bc0d3e643..cb88d6e027 100644
--- a/wp-content/themes/twentysixteen/header.php
+++ b/wp-content/themes/twentysixteen/header.php
@@ -40,7 +40,7 @@
 
 					$description = get_bloginfo( 'description', 'display' );
 if ( $description || is_customize_preview() ) :
-					?>
+	?>
 						<p class="site-description"><?php echo $description; ?></p>
 					<?php endif; ?>
 				</div><!-- .site-branding -->
diff --git a/wp-content/themes/twentysixteen/image.php b/wp-content/themes/twentysixteen/image.php
index f67048b3b4..5fcbb90155 100644
--- a/wp-content/themes/twentysixteen/image.php
+++ b/wp-content/themes/twentysixteen/image.php
@@ -16,7 +16,7 @@ get_header(); ?>
 				// Start the loop.
 			while ( have_posts() ) :
 				the_post();
-			?>
+				?>
 
 			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
@@ -63,7 +63,7 @@ get_header(); ?>
 								'separator'   => '<span class="screen-reader-text">, </span>',
 							)
 						);
-					?>
+						?>
 					</div><!-- .entry-content -->
 
 					<footer class="entry-footer">
@@ -91,7 +91,7 @@ get_header(); ?>
 							'<span class="edit-link">',
 							'</span>'
 						);
-					?>
+						?>
 					</footer><!-- .entry-footer -->
 				</article><!-- #post-## -->
 
diff --git a/wp-content/themes/twentysixteen/inc/back-compat.php b/wp-content/themes/twentysixteen/inc/back-compat.php
index ed0f86df03..c97940e002 100644
--- a/wp-content/themes/twentysixteen/inc/back-compat.php
+++ b/wp-content/themes/twentysixteen/inc/back-compat.php
@@ -51,7 +51,9 @@ function twentysixteen_upgrade_notice() {
  */
 function twentysixteen_customize() {
 	wp_die(
-		sprintf( __( 'Twenty Sixteen requires at least WordPress version 4.4. You are running version %s. Please upgrade and try again.', 'twentysixteen' ), $GLOBALS['wp_version'] ), '', array(
+		sprintf( __( 'Twenty Sixteen requires at least WordPress version 4.4. You are running version %s. Please upgrade and try again.', 'twentysixteen' ), $GLOBALS['wp_version'] ),
+		'',
+		array(
 			'back_link' => true,
 		)
 	);
diff --git a/wp-content/themes/twentysixteen/inc/customizer.php b/wp-content/themes/twentysixteen/inc/customizer.php
index 0cc2fb5296..9867d3d99e 100644
--- a/wp-content/themes/twentysixteen/inc/customizer.php
+++ b/wp-content/themes/twentysixteen/inc/customizer.php
@@ -31,8 +31,10 @@ function twentysixteen_custom_header_and_background() {
 	 * }
 	 */
 	add_theme_support(
-		'custom-background', apply_filters(
-			'twentysixteen_custom_background_args', array(
+		'custom-background',
+		apply_filters(
+			'twentysixteen_custom_background_args',
+			array(
 				'default-color' => $default_background_color,
 			)
 		)
@@ -55,8 +57,10 @@ function twentysixteen_custom_header_and_background() {
 	 * }
 	 */
 	add_theme_support(
-		'custom-header', apply_filters(
-			'twentysixteen_custom_header_args', array(
+		'custom-header',
+		apply_filters(
+			'twentysixteen_custom_header_args',
+			array(
 				'default-text-color' => $default_text_color,
 				'width'              => 1200,
 				'height'             => 280,
@@ -116,14 +120,16 @@ function twentysixteen_customize_register( $wp_customize ) {
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
 		$wp_customize->selective_refresh->add_partial(
-			'blogname', array(
+			'blogname',
+			array(
 				'selector'            => '.site-title a',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentysixteen_customize_partial_blogname',
 			)
 		);
 		$wp_customize->selective_refresh->add_partial(
-			'blogdescription', array(
+			'blogdescription',
+			array(
 				'selector'            => '.site-description',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentysixteen_customize_partial_blogdescription',
@@ -133,7 +139,8 @@ function twentysixteen_customize_register( $wp_customize ) {
 
 	// Add color scheme setting and control.
 	$wp_customize->add_setting(
-		'color_scheme', array(
+		'color_scheme',
+		array(
 			'default'           => 'default',
 			'sanitize_callback' => 'twentysixteen_sanitize_color_scheme',
 			'transport'         => 'postMessage',
@@ -141,7 +148,8 @@ function twentysixteen_customize_register( $wp_customize ) {
 	);
 
 	$wp_customize->add_control(
-		'color_scheme', array(
+		'color_scheme',
+		array(
 			'label'    => __( 'Base Color Scheme', 'twentysixteen' ),
 			'section'  => 'colors',
 			'type'     => 'select',
@@ -152,7 +160,8 @@ function twentysixteen_customize_register( $wp_customize ) {
 
 	// Add page background color setting and control.
 	$wp_customize->add_setting(
-		'page_background_color', array(
+		'page_background_color',
+		array(
 			'default'           => $color_scheme[1],
 			'sanitize_callback' => 'sanitize_hex_color',
 			'transport'         => 'postMessage',
@@ -161,7 +170,9 @@ function twentysixteen_customize_register( $wp_customize ) {
 
 	$wp_customize->add_control(
 		new WP_Customize_Color_Control(
-			$wp_customize, 'page_background_color', array(
+			$wp_customize,
+			'page_background_color',
+			array(
 				'label'   => __( 'Page Background Color', 'twentysixteen' ),
 				'section' => 'colors',
 			)
@@ -173,7 +184,8 @@ function twentysixteen_customize_register( $wp_customize ) {
 
 	// Add link color setting and control.
 	$wp_customize->add_setting(
-		'link_color', array(
+		'link_color',
+		array(
 			'default'           => $color_scheme[2],
 			'sanitize_callback' => 'sanitize_hex_color',
 			'transport'         => 'postMessage',
@@ -182,7 +194,9 @@ function twentysixteen_customize_register( $wp_customize ) {
 
 	$wp_customize->add_control(
 		new WP_Customize_Color_Control(
-			$wp_customize, 'link_color', array(
+			$wp_customize,
+			'link_color',
+			array(
 				'label'   => __( 'Link Color', 'twentysixteen' ),
 				'section' => 'colors',
 			)
@@ -191,7 +205,8 @@ function twentysixteen_customize_register( $wp_customize ) {
 
 	// Add main text color setting and control.
 	$wp_customize->add_setting(
-		'main_text_color', array(
+		'main_text_color',
+		array(
 			'default'           => $color_scheme[3],
 			'sanitize_callback' => 'sanitize_hex_color',
 			'transport'         => 'postMessage',
@@ -200,7 +215,9 @@ function twentysixteen_customize_register( $wp_customize ) {
 
 	$wp_customize->add_control(
 		new WP_Customize_Color_Control(
-			$wp_customize, 'main_text_color', array(
+			$wp_customize,
+			'main_text_color',
+			array(
 				'label'   => __( 'Main Text Color', 'twentysixteen' ),
 				'section' => 'colors',
 			)
@@ -209,7 +226,8 @@ function twentysixteen_customize_register( $wp_customize ) {
 
 	// Add secondary text color setting and control.
 	$wp_customize->add_setting(
-		'secondary_text_color', array(
+		'secondary_text_color',
+		array(
 			'default'           => $color_scheme[4],
 			'sanitize_callback' => 'sanitize_hex_color',
 			'transport'         => 'postMessage',
@@ -218,7 +236,9 @@ function twentysixteen_customize_register( $wp_customize ) {
 
 	$wp_customize->add_control(
 		new WP_Customize_Color_Control(
-			$wp_customize, 'secondary_text_color', array(
+			$wp_customize,
+			'secondary_text_color',
+			array(
 				'label'   => __( 'Secondary Text Color', 'twentysixteen' ),
 				'section' => 'colors',
 			)
@@ -289,7 +309,8 @@ function twentysixteen_get_color_schemes() {
 	 * }
 	 */
 	return apply_filters(
-		'twentysixteen_color_schemes', array(
+		'twentysixteen_color_schemes',
+		array(
 			'default' => array(
 				'label'  => __( 'Default', 'twentysixteen' ),
 				'colors' => array(
@@ -488,7 +509,8 @@ add_action( 'customize_preview_init', 'twentysixteen_customize_preview_js' );
  */
 function twentysixteen_get_color_scheme_css( $colors ) {
 	$colors = wp_parse_args(
-		$colors, array(
+		$colors,
+		array(
 			'background_color'      => '',
 			'page_background_color' => '',
 			'link_color'            => '',
diff --git a/wp-content/themes/twentysixteen/inc/template-tags.php b/wp-content/themes/twentysixteen/inc/template-tags.php
index ce5190a001..963513f631 100644
--- a/wp-content/themes/twentysixteen/inc/template-tags.php
+++ b/wp-content/themes/twentysixteen/inc/template-tags.php
@@ -133,10 +133,10 @@ if ( ! function_exists( 'twentysixteen_post_thumbnail' ) ) :
 		}
 
 		if ( is_singular() ) :
-		?>
+			?>
 
 		<div class="post-thumbnail">
-		<?php the_post_thumbnail(); ?>
+			<?php the_post_thumbnail(); ?>
 	</div><!-- .post-thumbnail -->
 
 	<?php else : ?>
@@ -166,11 +166,11 @@ if ( ! function_exists( 'twentysixteen_excerpt' ) ) :
 		$class = esc_attr( $class );
 
 		if ( has_excerpt() || is_search() ) :
-		?>
+			?>
 			<div class="<?php echo $class; ?>">
 				<?php the_excerpt(); ?>
 			</div><!-- .<?php echo $class; ?> -->
-		<?php
+			<?php
 		endif;
 	}
 endif;
diff --git a/wp-content/themes/twentysixteen/template-parts/content-page.php b/wp-content/themes/twentysixteen/template-parts/content-page.php
index 470776b405..d1ee87c629 100644
--- a/wp-content/themes/twentysixteen/template-parts/content-page.php
+++ b/wp-content/themes/twentysixteen/template-parts/content-page.php
@@ -42,6 +42,6 @@
 			'<footer class="entry-footer"><span class="edit-link">',
 			'</span></footer><!-- .entry-footer -->'
 		);
-	?>
+		?>
 
 </article><!-- #post-## -->
diff --git a/wp-content/themes/twentysixteen/template-parts/content-single.php b/wp-content/themes/twentysixteen/template-parts/content-single.php
index 58f829b45e..d1061b27d2 100644
--- a/wp-content/themes/twentysixteen/template-parts/content-single.php
+++ b/wp-content/themes/twentysixteen/template-parts/content-single.php
@@ -35,7 +35,7 @@
 			if ( '' !== get_the_author_meta( 'description' ) ) {
 				get_template_part( 'template-parts/biography' );
 			}
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-footer">
@@ -50,6 +50,6 @@
 				'<span class="edit-link">',
 				'</span>'
 			);
-		?>
+			?>
 	</footer><!-- .entry-footer -->
 </article><!-- #post-## -->
diff --git a/wp-content/themes/twentysixteen/template-parts/content.php b/wp-content/themes/twentysixteen/template-parts/content.php
index 703487dca4..cf88417f98 100644
--- a/wp-content/themes/twentysixteen/template-parts/content.php
+++ b/wp-content/themes/twentysixteen/template-parts/content.php
@@ -41,7 +41,7 @@
 					'separator'   => '<span class="screen-reader-text">, </span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-footer">
@@ -56,6 +56,6 @@
 				'<span class="edit-link">',
 				'</span>'
 			);
-		?>
+			?>
 	</footer><!-- .entry-footer -->
 </article><!-- #post-## -->
diff --git a/wp-content/themes/twentyten/author.php b/wp-content/themes/twentyten/author.php
index b851764f11..afb8240f89 100644
--- a/wp-content/themes/twentyten/author.php
+++ b/wp-content/themes/twentyten/author.php
@@ -31,7 +31,7 @@ if ( have_posts() ) {
 <?php
 // If a user has filled out their description, show a bio on their entries.
 if ( get_the_author_meta( 'description' ) ) :
-?>
+	?>
 					<div id="entry-author-info">
 						<div id="author-avatar">
 							<?php
diff --git a/wp-content/themes/twentyten/comments.php b/wp-content/themes/twentyten/comments.php
index 4b0943fb95..faabb40b5f 100644
--- a/wp-content/themes/twentyten/comments.php
+++ b/wp-content/themes/twentyten/comments.php
@@ -17,7 +17,7 @@
 <?php if ( post_password_required() ) : ?>
 				<p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></p>
 			</div><!-- #comments -->
-<?php
+	<?php
 		/*
 		 * Stop the rest of comments.php from being processed,
 		 * but don't kill the script entirely -- we still have
@@ -36,17 +36,18 @@
 			<?php
 			printf(
 				_n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
-				number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>'
+				number_format_i18n( get_comments_number() ),
+				'<em>' . get_the_title() . '</em>'
 			);
 			?>
 			</h3>
 
-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
+	<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
 			<div class="navigation">
 				<div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>
 				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
 			</div> <!-- .navigation -->
-<?php endif; // check for comment navigation ?>
+	<?php endif; // check for comment navigation ?>
 
 			<ol class="commentlist">
 				<?php
@@ -61,12 +62,12 @@
 				?>
 			</ol>
 
-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
+	<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
 			<div class="navigation">
 				<div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>
 				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
 			</div><!-- .navigation -->
-<?php endif; // check for comment navigation ?>
+	<?php endif; // check for comment navigation ?>
 
 	<?php
 	/*
@@ -74,7 +75,7 @@
 	 * But we only want the note on posts and pages that had comments in the first place.
 	 */
 	if ( ! comments_open() && get_comments_number() ) :
-	?>
+		?>
 		<p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
 	<?php endif; ?>
 
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index 0686cbee2b..5b1a73807a 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -100,7 +100,8 @@ if ( ! function_exists( 'twentyten_setup' ) ) :
 
 		// This theme allows users to set a custom background.
 		add_theme_support(
-			'custom-background', array(
+			'custom-background',
+			array(
 				// Let WordPress know what our default background color is.
 				'default-color' => 'f1f1f1',
 			)
@@ -226,7 +227,7 @@ if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
 	 * @since Twenty Ten 1.0
 	 */
 	function twentyten_admin_header_style() {
-	?>
+		?>
 	<style type="text/css" id="twentyten-admin-header-css">
 	/* Shows the same border as on front end */
 	#headimg {
@@ -238,7 +239,7 @@ if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
 	#headimg #desc { }
 	*/
 	</style>
-	<?php
+		<?php
 	}
 endif;
 
@@ -377,14 +378,14 @@ if ( ! function_exists( 'twentyten_comment' ) ) :
 		$GLOBALS['comment'] = $comment;
 		switch ( $comment->comment_type ) :
 			case '':
-		?>
+				?>
 		<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
 		<div id="comment-<?php comment_ID(); ?>">
 			<div class="comment-author vcard">
 				<?php echo get_avatar( $comment, 40 ); ?>
 				<?php printf( __( '%s <span class="says">says:</span>', 'twentyten' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
 			</div><!-- .comment-author .vcard -->
-			<?php if ( $comment->comment_approved == '0' ) : ?>
+				<?php if ( $comment->comment_approved == '0' ) : ?>
 				<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
 				<br />
 			<?php endif; ?>
@@ -393,11 +394,11 @@ if ( ! function_exists( 'twentyten_comment' ) ) :
 				<?php
 					/* translators: 1: date, 2: time */
 					printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() );
-					?>
+				?>
 					</a>
 					<?php
 					edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' );
-				?>
+					?>
 				</div><!-- .comment-meta .commentmetadata -->
 
 				<div class="comment-body"><?php comment_text(); ?></div>
@@ -406,24 +407,25 @@ if ( ! function_exists( 'twentyten_comment' ) ) :
 				<?php
 				comment_reply_link(
 					array_merge(
-						$args, array(
+						$args,
+						array(
 							'depth'     => $depth,
 							'max_depth' => $args['max_depth'],
 						)
 					)
 				);
-?>
+				?>
 				</div><!-- .reply -->
 			</div><!-- #comment-##  -->
 
-		<?php
+				<?php
 				break;
 			case 'pingback':
 			case 'trackback':
-		?>
+				?>
 		<li class="post pingback">
 		<p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></p>
-	<?php
+				<?php
 				break;
 		endswitch;
 	}
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index 6c2ee4c46b..d62acee0d1 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -35,7 +35,7 @@ if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
 	echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) ) );
 }
 
-	?>
+?>
 	</title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
@@ -100,7 +100,7 @@ if ( is_singular() && get_option( 'thread_comments' ) ) {
 							$header_image_width  = HEADER_IMAGE_WIDTH;
 							$header_image_height = HEADER_IMAGE_HEIGHT;
 						}
-					?>
+						?>
 						<img src="<?php header_image(); ?>" width="<?php echo esc_attr( $header_image_width ); ?>" height="<?php echo esc_attr( $header_image_height ); ?>" alt="" />
 					<?php endif; ?>
 			</div><!-- #branding -->
@@ -116,7 +116,7 @@ if ( is_singular() && get_option( 'thread_comments' ) ) {
 						'theme_location'  => 'primary',
 					)
 				);
-?>
+				?>
 			</div><!-- #access -->
 		</div><!-- #masthead -->
 	</div><!-- #header -->
diff --git a/wp-content/themes/twentyten/loop-attachment.php b/wp-content/themes/twentyten/loop-attachment.php
index 04da9f48d4..20564c21b5 100644
--- a/wp-content/themes/twentyten/loop-attachment.php
+++ b/wp-content/themes/twentyten/loop-attachment.php
@@ -19,14 +19,14 @@
 if ( have_posts() ) {
 	while ( have_posts() ) :
 		the_post();
-	?>
+		?>
 
 				<?php if ( ! empty( $post->post_parent ) ) : ?>
 					<p class="page-title"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" title="<?php echo esc_attr( sprintf( __( 'Return to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) ) ); ?>" rel="gallery">
 																<?php
 																/* translators: %s - title of parent post */
 																printf( __( '<span class="meta-nav">&larr;</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
-					?>
+																?>
 					</a></p>
 				<?php endif; ?>
 
@@ -45,7 +45,7 @@ if ( have_posts() ) {
 									get_the_author()
 								)
 							);
-							?>
+						?>
 							<span class="meta-sep">|</span>
 							<?php
 							printf(
@@ -77,40 +77,40 @@ if ( have_posts() ) {
 
 						<div class="entry-content">
 						<div class="entry-attachment">
-	<?php
-	if ( wp_attachment_is_image() ) :
-		$attachments = array_values(
-			get_children(
-				array(
-					'post_parent'    => $post->post_parent,
-					'post_status'    => 'inherit',
-					'post_type'      => 'attachment',
-					'post_mime_type' => 'image',
-					'order'          => 'ASC',
-					'orderby'        => 'menu_order ID',
+		<?php
+		if ( wp_attachment_is_image() ) :
+			$attachments = array_values(
+				get_children(
+					array(
+						'post_parent'    => $post->post_parent,
+						'post_status'    => 'inherit',
+						'post_type'      => 'attachment',
+						'post_mime_type' => 'image',
+						'order'          => 'ASC',
+						'orderby'        => 'menu_order ID',
+					)
 				)
-			)
-		);
-		foreach ( $attachments as $k => $attachment ) {
-			if ( $attachment->ID == $post->ID ) {
-				break;
+			);
+			foreach ( $attachments as $k => $attachment ) {
+				if ( $attachment->ID == $post->ID ) {
+					break;
+				}
 			}
-		}
 
-		// If there is more than 1 image attachment in a gallery
-		if ( count( $attachments ) > 1 ) {
-			$k++;
-			if ( isset( $attachments[ $k ] ) ) {
-				// get the URL of the next image attachment
-				$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
-			} else {          // or get the URL of the first image attachment
-				$next_attachment_url = get_attachment_link( $attachments[0]->ID );
+			// If there is more than 1 image attachment in a gallery
+			if ( count( $attachments ) > 1 ) {
+				$k++;
+				if ( isset( $attachments[ $k ] ) ) {
+					// get the URL of the next image attachment
+					$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+				} else {          // or get the URL of the first image attachment
+					$next_attachment_url = get_attachment_link( $attachments[0]->ID );
+				}
+			} else {
+				// or, if there's only 1 image attachment, get the URL of the image
+				$next_attachment_url = wp_get_attachment_url();
 			}
-		} else {
-			// or, if there's only 1 image attachment, get the URL of the image
-			$next_attachment_url = wp_get_attachment_url();
-		}
-	?>
+			?>
 						<p class="attachment"><a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
 																	<?php
 																	/**
@@ -130,14 +130,14 @@ if ( have_posts() ) {
 																	 */
 																	$attachment_height = apply_filters( 'twentyten_attachment_height', 900 );
 																	echo wp_get_attachment_image( $post->ID, array( $attachment_width, $attachment_height ) ); // filterable image width with, essentially, no limit for image height.
-							?>
+																	?>
 							</a></p>
 
 							<div id="nav-below" class="navigation">
 							<div class="nav-previous"><?php previous_image_link( false ); ?></div>
 							<div class="nav-next"><?php next_image_link( false ); ?></div>
 						</div><!-- #nav-below -->
-	<?php else : ?>
+		<?php else : ?>
 						<a href="<?php echo esc_url( wp_get_attachment_url() ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php echo esc_html( basename( get_permalink() ) ); ?></a>
 	<?php endif; ?>
 						</div><!-- .entry-attachment -->
@@ -145,18 +145,18 @@ if ( have_posts() ) {
 						<?php
 						if ( ! empty( $post->post_excerpt ) ) {
 							the_excerpt();}
-?>
+						?>
 </div>
 
-	<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-	<?php
-	wp_link_pages(
-		array(
-			'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
-			'after'  => '</div>',
-		)
-	);
-	?>
+		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+		<?php
+		wp_link_pages(
+			array(
+				'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+				'after'  => '</div>',
+			)
+		);
+		?>
 
 					</div><!-- .entry-content -->
 
@@ -166,7 +166,7 @@ if ( have_posts() ) {
 					</div><!-- .entry-utility -->
 				</div><!-- #post-## -->
 
-<?php comments_template(); ?>
+		<?php comments_template(); ?>
 
 <?php endwhile;
 }; // end of the loop. ?>
diff --git a/wp-content/themes/twentyten/loop-page.php b/wp-content/themes/twentyten/loop-page.php
index f522cff95f..aab5b5b0a1 100644
--- a/wp-content/themes/twentyten/loop-page.php
+++ b/wp-content/themes/twentyten/loop-page.php
@@ -19,7 +19,7 @@
 if ( have_posts() ) {
 	while ( have_posts() ) :
 		the_post();
-	?>
+		?>
 
 				<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 					<?php if ( is_front_page() ) { ?>
@@ -37,7 +37,7 @@ if ( have_posts() ) {
 								'after'  => '</div>',
 							)
 						);
-	?>
+						?>
 						<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
 					</div><!-- .entry-content -->
 				</div><!-- #post-## -->
diff --git a/wp-content/themes/twentyten/loop-single.php b/wp-content/themes/twentyten/loop-single.php
index b9a791a628..ee2ad47153 100644
--- a/wp-content/themes/twentyten/loop-single.php
+++ b/wp-content/themes/twentyten/loop-single.php
@@ -19,7 +19,7 @@
 if ( have_posts() ) {
 	while ( have_posts() ) :
 		the_post();
-	?>
+		?>
 
 				<div id="nav-above" class="navigation">
 					<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
@@ -42,10 +42,10 @@ if ( have_posts() ) {
 								'after'  => '</div>',
 							)
 						);
-	?>
+						?>
 					</div><!-- .entry-content -->
 
-	<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
+		<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
 					<div id="entry-author-info">
 						<div id="author-avatar">
 							<?php
diff --git a/wp-content/themes/twentyten/loop.php b/wp-content/themes/twentyten/loop.php
index 220ba7b0ec..b241b1bc7f 100644
--- a/wp-content/themes/twentyten/loop.php
+++ b/wp-content/themes/twentyten/loop.php
@@ -58,9 +58,9 @@
 <?php
 while ( have_posts() ) :
 	the_post();
-?>
+	?>
 
-<?php /* How to display posts of the Gallery format. The gallery category is the old way. */ ?>
+	<?php /* How to display posts of the Gallery format. The gallery category is the old way. */ ?>
 
 	<?php if ( ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) || in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) ) : ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
@@ -71,7 +71,7 @@ while ( have_posts() ) :
 			</div><!-- .entry-meta -->
 
 			<div class="entry-content">
-<?php if ( post_password_required() ) : ?>
+		<?php if ( post_password_required() ) : ?>
 				<?php the_content(); ?>
 <?php else : ?>
 				<?php
@@ -79,7 +79,7 @@ while ( have_posts() ) :
 				if ( $images ) :
 					$total_images = count( $images );
 					$image        = reset( $images );
-				?>
+					?>
 					<div class="gallery-thumb">
 						<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
 					</div><!-- .gallery-thumb -->
@@ -90,7 +90,7 @@ while ( have_posts() ) :
 							'href="' . esc_url( get_permalink() ) . '" title="' . esc_attr( sprintf( __( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) ) . '" rel="bookmark"',
 							number_format_i18n( $total_images )
 						);
-							?>
+					?>
 							</em></p>
 				<?php endif; // end twentyten_get_gallery_images() check ?>
 						<?php the_excerpt(); ?>
@@ -110,7 +110,7 @@ while ( have_posts() ) :
 			</div><!-- .entry-utility -->
 		</div><!-- #post-## -->
 
-<?php /* How to display posts of the Aside format. The asides category is the old way. */ ?>
+		<?php /* How to display posts of the Aside format. The asides category is the old way. */ ?>
 
 	<?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'twentyten' ) ) ) : ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
@@ -133,7 +133,7 @@ while ( have_posts() ) :
 			</div><!-- .entry-utility -->
 		</div><!-- #post-## -->
 
-<?php /* How to display all other posts. */ ?>
+	<?php /* How to display all other posts. */ ?>
 
 	<?php else : ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
@@ -157,7 +157,7 @@ while ( have_posts() ) :
 						'after'  => '</div>',
 					)
 				);
-?>
+				?>
 			</div><!-- .entry-content -->
 	<?php endif; ?>
 
@@ -171,7 +171,7 @@ while ( have_posts() ) :
 				<?php
 					$tags_list = get_the_tag_list( '', ', ' );
 				if ( $tags_list ) :
-				?>
+					?>
 				<span class="tag-links">
 					<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
 				</span>
diff --git a/wp-content/themes/twentythirteen/archive.php b/wp-content/themes/twentythirteen/archive.php
index f318aa1fe0..e8cc26a56e 100644
--- a/wp-content/themes/twentythirteen/archive.php
+++ b/wp-content/themes/twentythirteen/archive.php
@@ -35,7 +35,7 @@ get_header(); ?>
 					else :
 						_e( 'Archives', 'twentythirteen' );
 					endif;
-				?>
+					?>
 				</h1>
 			</header><!-- .archive-header -->
 
@@ -43,7 +43,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentythirteen/author.php b/wp-content/themes/twentythirteen/author.php
index efdd005db7..aadcd0e852 100644
--- a/wp-content/themes/twentythirteen/author.php
+++ b/wp-content/themes/twentythirteen/author.php
@@ -48,7 +48,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentythirteen/category.php b/wp-content/themes/twentythirteen/category.php
index a219d544aa..7751df3d1c 100644
--- a/wp-content/themes/twentythirteen/category.php
+++ b/wp-content/themes/twentythirteen/category.php
@@ -27,7 +27,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentythirteen/comments.php b/wp-content/themes/twentythirteen/comments.php
index 9b92c68f8b..464235cc9e 100644
--- a/wp-content/themes/twentythirteen/comments.php
+++ b/wp-content/themes/twentythirteen/comments.php
@@ -25,7 +25,8 @@ if ( post_password_required() ) {
 			<?php
 				printf(
 					_nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'twentythirteen' ),
-					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
+					number_format_i18n( get_comments_number() ),
+					'<span>' . get_the_title() . '</span>'
 				);
 			?>
 		</h2>
@@ -45,7 +46,7 @@ if ( post_password_required() ) {
 		<?php
 			// Are there comments to navigate through?
 		if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
-		?>
+			?>
 		<nav class="navigation comment-navigation" role="navigation">
 		<h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1>
 		<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentythirteen' ) ); ?></div>
diff --git a/wp-content/themes/twentythirteen/content-aside.php b/wp-content/themes/twentythirteen/content-aside.php
index bbec8c9b94..25235a5c86 100644
--- a/wp-content/themes/twentythirteen/content-aside.php
+++ b/wp-content/themes/twentythirteen/content-aside.php
@@ -27,7 +27,7 @@
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-audio.php b/wp-content/themes/twentythirteen/content-audio.php
index 728a68a8f7..83a2545b12 100644
--- a/wp-content/themes/twentythirteen/content-audio.php
+++ b/wp-content/themes/twentythirteen/content-audio.php
@@ -38,7 +38,7 @@
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 		</div><!-- .audio-content -->
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-chat.php b/wp-content/themes/twentythirteen/content-chat.php
index 92c703c8cd..390e005abc 100644
--- a/wp-content/themes/twentythirteen/content-chat.php
+++ b/wp-content/themes/twentythirteen/content-chat.php
@@ -37,7 +37,7 @@
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-gallery.php b/wp-content/themes/twentythirteen/content-gallery.php
index 705cb2da96..27777e1e24 100644
--- a/wp-content/themes/twentythirteen/content-gallery.php
+++ b/wp-content/themes/twentythirteen/content-gallery.php
@@ -38,7 +38,7 @@
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 		<?php else : ?>
 			<?php echo get_post_gallery(); ?>
 		<?php endif; // is_single() ?>
diff --git a/wp-content/themes/twentythirteen/content-image.php b/wp-content/themes/twentythirteen/content-image.php
index 866e63f89b..ed737c3cf1 100644
--- a/wp-content/themes/twentythirteen/content-image.php
+++ b/wp-content/themes/twentythirteen/content-image.php
@@ -37,7 +37,7 @@
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-link.php b/wp-content/themes/twentythirteen/content-link.php
index 5fdbb8f9de..ff2999951a 100644
--- a/wp-content/themes/twentythirteen/content-link.php
+++ b/wp-content/themes/twentythirteen/content-link.php
@@ -38,7 +38,7 @@
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<?php if ( is_single() ) : ?>
diff --git a/wp-content/themes/twentythirteen/content-quote.php b/wp-content/themes/twentythirteen/content-quote.php
index 83562bc5ad..1a53687665 100644
--- a/wp-content/themes/twentythirteen/content-quote.php
+++ b/wp-content/themes/twentythirteen/content-quote.php
@@ -27,7 +27,7 @@
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-status.php b/wp-content/themes/twentythirteen/content-status.php
index f37539660c..62c6a36b3d 100644
--- a/wp-content/themes/twentythirteen/content-status.php
+++ b/wp-content/themes/twentythirteen/content-status.php
@@ -27,7 +27,7 @@
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/content-video.php b/wp-content/themes/twentythirteen/content-video.php
index aa81176329..d3c806a8bd 100644
--- a/wp-content/themes/twentythirteen/content-video.php
+++ b/wp-content/themes/twentythirteen/content-video.php
@@ -37,7 +37,7 @@
 					'link_after'  => '</span>',
 				)
 			);
-		?>
+			?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
index 68a3871317..677faec2d2 100644
--- a/wp-content/themes/twentythirteen/functions.php
+++ b/wp-content/themes/twentythirteen/functions.php
@@ -84,7 +84,8 @@ function twentythirteen_setup() {
 	 * and comments to output valid HTML5.
 	 */
 	add_theme_support(
-		'html5', array(
+		'html5',
+		array(
 			'search-form',
 			'comment-form',
 			'comment-list',
@@ -98,7 +99,8 @@ function twentythirteen_setup() {
 	 * See https://codex.wordpress.org/Post_Formats
 	 */
 	add_theme_support(
-		'post-formats', array(
+		'post-formats',
+		array(
 			'aside',
 			'audio',
 			'chat',
@@ -334,7 +336,7 @@ if ( ! function_exists( 'twentythirteen_paging_nav' ) ) :
 
 		</div><!-- .nav-links -->
 	</nav><!-- .navigation -->
-	<?php
+		<?php
 	}
 endif;
 
@@ -364,7 +366,7 @@ if ( ! function_exists( 'twentythirteen_post_nav' ) ) :
 
 		</div><!-- .nav-links -->
 	</nav><!-- .navigation -->
-	<?php
+		<?php
 	}
 endif;
 
@@ -611,14 +613,16 @@ function twentythirteen_customize_register( $wp_customize ) {
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
 		$wp_customize->selective_refresh->add_partial(
-			'blogname', array(
+			'blogname',
+			array(
 				'selector'            => '.site-title',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentythirteen_customize_partial_blogname',
 			)
 		);
 		$wp_customize->selective_refresh->add_partial(
-			'blogdescription', array(
+			'blogdescription',
+			array(
 				'selector'            => '.site-description',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentythirteen_customize_partial_blogdescription',
diff --git a/wp-content/themes/twentythirteen/header.php b/wp-content/themes/twentythirteen/header.php
index 6253472829..8343d76af2 100644
--- a/wp-content/themes/twentythirteen/header.php
+++ b/wp-content/themes/twentythirteen/header.php
@@ -50,7 +50,7 @@
 							'menu_id'        => 'primary-menu',
 						)
 					);
-?>
+					?>
 					<?php get_search_form(); ?>
 				</nav><!-- #site-navigation -->
 			</div><!-- #navbar -->
diff --git a/wp-content/themes/twentythirteen/image.php b/wp-content/themes/twentythirteen/image.php
index f6de824caa..d3ef31ef2e 100644
--- a/wp-content/themes/twentythirteen/image.php
+++ b/wp-content/themes/twentythirteen/image.php
@@ -18,7 +18,7 @@ get_header(); ?>
 				// Start the Loop.
 			while ( have_posts() ) :
 				the_post();
-			?>
+				?>
 
 			<article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
 			<header class="entry-header">
@@ -91,7 +91,7 @@ get_header(); ?>
 				</div><!-- .entry-content -->
 			</article><!-- #post -->
 
-			<?php comments_template(); ?>
+				<?php comments_template(); ?>
 
 			<?php endwhile; // End the loop. ?>
 
diff --git a/wp-content/themes/twentythirteen/inc/back-compat.php b/wp-content/themes/twentythirteen/inc/back-compat.php
index 9f72aa189d..80940887fb 100644
--- a/wp-content/themes/twentythirteen/inc/back-compat.php
+++ b/wp-content/themes/twentythirteen/inc/back-compat.php
@@ -45,7 +45,9 @@ function twentythirteen_upgrade_notice() {
  */
 function twentythirteen_customize() {
 	wp_die(
-		sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ), '', array(
+		sprintf( __( 'Twenty Thirteen requires at least WordPress version 3.6. You are running version %s. Please upgrade and try again.', 'twentythirteen' ), $GLOBALS['wp_version'] ),
+		'',
+		array(
 			'back_link' => true,
 		)
 	);
diff --git a/wp-content/themes/twentythirteen/inc/custom-header.php b/wp-content/themes/twentythirteen/inc/custom-header.php
index c572c3bb5a..55679ce9ec 100644
--- a/wp-content/themes/twentythirteen/inc/custom-header.php
+++ b/wp-content/themes/twentythirteen/inc/custom-header.php
@@ -99,7 +99,7 @@ function twentythirteen_header_style() {
 	<style type="text/css" id="twentythirteen-header-css">
 	<?php
 	if ( ! empty( $header_image ) ) :
-	?>
+		?>
 	.site-header {
 		background: url(<?php header_image(); ?>) no-repeat scroll top;
 		background-size: 1600px auto;
@@ -114,30 +114,30 @@ function twentythirteen_header_style() {
 			background-size: 360px auto;
 		}
 	}
-	<?php
+		<?php
 		endif;
 
 		// Has the text been hidden?
 	if ( ! display_header_text() ) :
-	?>
+		?>
 	.site-title,
 	.site-description {
 		position: absolute;
 		clip: rect(1px 1px 1px 1px); /* IE7 */
 		clip: rect(1px, 1px, 1px, 1px);
 	}
-	<?php
-	if ( empty( $header_image ) ) :
-	?>
+		<?php
+		if ( empty( $header_image ) ) :
+			?>
 	.site-header .home-link {
 	min-height: 0;
 	}
-	<?php
+			<?php
 		endif;
 
 		// If the user has set a custom color for the text, use that.
 		elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
-	?>
+			?>
 		.site-title,
 		.site-description {
 			color: #<?php echo esc_attr( $text_color ); ?>;
@@ -154,7 +154,7 @@ function twentythirteen_header_style() {
  */
 function twentythirteen_admin_header_style() {
 	$header_image = get_header_image();
-?>
+	?>
 	<style type="text/css" id="twentythirteen-admin-header-css">
 	.appearance_page_custom-header #headimg {
 		border: none;
@@ -210,7 +210,7 @@ function twentythirteen_admin_header_style() {
 		width: auto;
 	}
 	</style>
-<?php
+	<?php
 }
 
 /**
@@ -232,5 +232,5 @@ function twentythirteen_admin_header_image() {
 			<h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2>
 		</div>
 	</div>
-<?php
+	<?php
 }
diff --git a/wp-content/themes/twentythirteen/index.php b/wp-content/themes/twentythirteen/index.php
index aa78669d8c..4db10badd3 100644
--- a/wp-content/themes/twentythirteen/index.php
+++ b/wp-content/themes/twentythirteen/index.php
@@ -24,7 +24,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentythirteen/page.php b/wp-content/themes/twentythirteen/page.php
index 907a73586c..5fad9750e0 100644
--- a/wp-content/themes/twentythirteen/page.php
+++ b/wp-content/themes/twentythirteen/page.php
@@ -20,7 +20,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 
 				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 					<header class="entry-header">
@@ -44,7 +44,7 @@ get_header(); ?>
 								'link_after'  => '</span>',
 							)
 						);
-?>
+						?>
 					</div><!-- .entry-content -->
 
 					<footer class="entry-meta">
diff --git a/wp-content/themes/twentythirteen/search.php b/wp-content/themes/twentythirteen/search.php
index a9e073e987..5b335f4cb5 100644
--- a/wp-content/themes/twentythirteen/search.php
+++ b/wp-content/themes/twentythirteen/search.php
@@ -22,7 +22,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentythirteen/single.php b/wp-content/themes/twentythirteen/single.php
index 98dec5b2bb..587ae86561 100644
--- a/wp-content/themes/twentythirteen/single.php
+++ b/wp-content/themes/twentythirteen/single.php
@@ -16,7 +16,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 
 				<?php get_template_part( 'content', get_post_format() ); ?>
 				<?php twentythirteen_post_nav(); ?>
diff --git a/wp-content/themes/twentythirteen/tag.php b/wp-content/themes/twentythirteen/tag.php
index 18a5a71c4f..12a02e0abd 100644
--- a/wp-content/themes/twentythirteen/tag.php
+++ b/wp-content/themes/twentythirteen/tag.php
@@ -29,7 +29,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentythirteen/taxonomy-post_format.php b/wp-content/themes/twentythirteen/taxonomy-post_format.php
index 6538d0d6d0..62840927a7 100644
--- a/wp-content/themes/twentythirteen/taxonomy-post_format.php
+++ b/wp-content/themes/twentythirteen/taxonomy-post_format.php
@@ -27,7 +27,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentytwelve/archive.php b/wp-content/themes/twentytwelve/archive.php
index cf0611c458..edd947ef06 100644
--- a/wp-content/themes/twentytwelve/archive.php
+++ b/wp-content/themes/twentytwelve/archive.php
@@ -35,7 +35,7 @@ get_header(); ?>
 					else :
 						_e( 'Archives', 'twentytwelve' );
 					endif;
-				?>
+					?>
 				</h1>
 			</header><!-- .archive-header -->
 
diff --git a/wp-content/themes/twentytwelve/author.php b/wp-content/themes/twentytwelve/author.php
index ace43e7bd8..0dbd267d64 100644
--- a/wp-content/themes/twentytwelve/author.php
+++ b/wp-content/themes/twentytwelve/author.php
@@ -45,7 +45,7 @@ get_header(); ?>
 			<?php
 			// If a user has filled out their description, show a bio on their entries.
 			if ( get_the_author_meta( 'description' ) ) :
-			?>
+				?>
 			<div class="author-info">
 				<div class="author-avatar">
 					<?php
@@ -71,7 +71,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentytwelve/comments.php b/wp-content/themes/twentytwelve/comments.php
index 19f5941dad..010c1aedf4 100644
--- a/wp-content/themes/twentytwelve/comments.php
+++ b/wp-content/themes/twentytwelve/comments.php
@@ -31,7 +31,8 @@ if ( post_password_required() ) {
 			<?php
 				printf(
 					_n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
-					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>'
+					number_format_i18n( get_comments_number() ),
+					'<span>' . get_the_title() . '</span>'
 				);
 			?>
 		</h2>
@@ -44,7 +45,7 @@ if ( post_password_required() ) {
 					'style'    => 'ol',
 				)
 			);
-?>
+			?>
 		</ol><!-- .commentlist -->
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
@@ -60,7 +61,7 @@ if ( post_password_required() ) {
 		 * But we only want the note on posts and pages that had comments in the first place.
 		 */
 		if ( ! comments_open() && get_comments_number() ) :
-		?>
+			?>
 		<p class="nocomments"><?php _e( 'Comments are closed.', 'twentytwelve' ); ?></p>
 		<?php endif; ?>
 
diff --git a/wp-content/themes/twentytwelve/content-page.php b/wp-content/themes/twentytwelve/content-page.php
index d1553444bb..3511b75f35 100644
--- a/wp-content/themes/twentytwelve/content-page.php
+++ b/wp-content/themes/twentytwelve/content-page.php
@@ -11,7 +11,7 @@
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<header class="entry-header">
 			<?php if ( ! is_page_template( 'page-templates/front-page.php' ) ) : ?>
-			<?php the_post_thumbnail(); ?>
+				<?php the_post_thumbnail(); ?>
 			<?php endif; ?>
 			<h1 class="entry-title"><?php the_title(); ?></h1>
 		</header>
@@ -25,7 +25,7 @@
 					'after'  => '</div>',
 				)
 			);
-?>
+			?>
 		</div><!-- .entry-content -->
 		<footer class="entry-meta">
 			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
diff --git a/wp-content/themes/twentytwelve/content.php b/wp-content/themes/twentytwelve/content.php
index 901b9bd873..2eab91d0f4 100644
--- a/wp-content/themes/twentytwelve/content.php
+++ b/wp-content/themes/twentytwelve/content.php
@@ -51,7 +51,7 @@
 					'after'  => '</div>',
 				)
 			);
-?>
+			?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
index 31fc282043..10744c5692 100644
--- a/wp-content/themes/twentytwelve/functions.php
+++ b/wp-content/themes/twentytwelve/functions.php
@@ -69,7 +69,8 @@ function twentytwelve_setup() {
 	 * and here we also set up the default background color.
 	 */
 	add_theme_support(
-		'custom-background', array(
+		'custom-background',
+		array(
 			'default-color' => 'e6e6e6',
 		)
 	);
@@ -330,7 +331,7 @@ if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
 				<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentytwelve' ) ); ?></div>
 				<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?></div>
 			</nav><!-- .navigation -->
-		<?php
+			<?php
 	endif;
 	}
 endif;
@@ -352,15 +353,15 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 			case 'pingback':
 			case 'trackback':
 				// Display trackbacks differently than normal comments.
-		?>
+				?>
 		<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
 		<p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p>
-	<?php
+				<?php
 				break;
 			default:
 				// Proceed with normal comments.
 				global $post;
-		?>
+				?>
 		<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
 		<article id="comment-<?php comment_ID(); ?>" class="comment">
 			<header class="comment-meta comment-author vcard">
@@ -379,7 +380,7 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 						/* translators: 1: date, 2: time */
 						sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() )
 					);
-					?>
+				?>
 				</header><!-- .comment-meta -->
 
 				<?php if ( '0' == $comment->comment_approved ) : ?>
@@ -395,7 +396,8 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 				<?php
 				comment_reply_link(
 					array_merge(
-						$args, array(
+						$args,
+						array(
 							'reply_text' => __( 'Reply', 'twentytwelve' ),
 							'after'      => ' <span>&darr;</span>',
 							'depth'      => $depth,
@@ -403,10 +405,10 @@ if ( ! function_exists( 'twentytwelve_comment' ) ) :
 						)
 					)
 				);
-?>
+				?>
 				</div><!-- .reply -->
 			</article><!-- #comment-## -->
-		<?php
+				<?php
 				break;
 		endswitch; // end comment_type check
 	}
@@ -551,14 +553,16 @@ function twentytwelve_customize_register( $wp_customize ) {
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
 		$wp_customize->selective_refresh->add_partial(
-			'blogname', array(
+			'blogname',
+			array(
 				'selector'            => '.site-title > a',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentytwelve_customize_partial_blogname',
 			)
 		);
 		$wp_customize->selective_refresh->add_partial(
-			'blogdescription', array(
+			'blogdescription',
+			array(
 				'selector'            => '.site-description',
 				'container_inclusive' => false,
 				'render_callback'     => 'twentytwelve_customize_partial_blogdescription',
diff --git a/wp-content/themes/twentytwelve/header.php b/wp-content/themes/twentytwelve/header.php
index 2b95b498e5..cbd555c31c 100644
--- a/wp-content/themes/twentytwelve/header.php
+++ b/wp-content/themes/twentytwelve/header.php
@@ -49,7 +49,7 @@
 					'menu_class'     => 'nav-menu',
 				)
 			);
-?>
+			?>
 		</nav><!-- #site-navigation -->
 
 		<?php if ( get_header_image() ) : ?>
diff --git a/wp-content/themes/twentytwelve/image.php b/wp-content/themes/twentytwelve/image.php
index d2d228ba65..76d3a549a6 100644
--- a/wp-content/themes/twentytwelve/image.php
+++ b/wp-content/themes/twentytwelve/image.php
@@ -17,7 +17,7 @@ get_header(); ?>
 		<?php
 		while ( have_posts() ) :
 			the_post();
-?>
+			?>
 
 				<article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
 					<header class="entry-header">
@@ -51,39 +51,39 @@ get_header(); ?>
 
 						<div class="entry-attachment">
 							<div class="attachment">
-<?php
-/*
- * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
- * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
- */
-$attachments = array_values(
-	get_children(
-		array(
-			'post_parent'    => $post->post_parent,
-			'post_status'    => 'inherit',
-			'post_type'      => 'attachment',
-			'post_mime_type' => 'image',
-			'order'          => 'ASC',
-			'orderby'        => 'menu_order ID',
-		)
-	)
-);
-foreach ( $attachments as $k => $attachment ) :
-	if ( $attachment->ID == $post->ID ) {
-		break;
-	}
+			<?php
+			/*
+			* Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
+			* or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
+			*/
+			$attachments = array_values(
+				get_children(
+					array(
+						'post_parent'    => $post->post_parent,
+						'post_status'    => 'inherit',
+						'post_type'      => 'attachment',
+						'post_mime_type' => 'image',
+						'order'          => 'ASC',
+						'orderby'        => 'menu_order ID',
+					)
+				)
+			);
+			foreach ( $attachments as $k => $attachment ) :
+				if ( $attachment->ID == $post->ID ) {
+					break;
+				}
 endforeach;
 
-// If there is more than 1 attachment in a gallery
-if ( count( $attachments ) > 1 ) :
-	$k++;
-	if ( isset( $attachments[ $k ] ) ) :
-		// get the URL of the next image attachment
-		$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
-	else :
-		// or get the URL of the first image attachment
-		$next_attachment_url = get_attachment_link( $attachments[0]->ID );
-	endif;
+			// If there is more than 1 attachment in a gallery
+			if ( count( $attachments ) > 1 ) :
+				$k++;
+				if ( isset( $attachments[ $k ] ) ) :
+					// get the URL of the next image attachment
+					$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+				else :
+					// or get the URL of the first image attachment
+					$next_attachment_url = get_attachment_link( $attachments[0]->ID );
+				endif;
 else :
 	// or, if there's only 1 image, get the URL of the image
 	$next_attachment_url = wp_get_attachment_url();
@@ -103,7 +103,7 @@ endif;
 													 */
 													$attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
 													echo wp_get_attachment_image( $post->ID, $attachment_size );
-								?>
+													?>
 								</a>
 
 								<?php if ( ! empty( $post->post_excerpt ) ) : ?>
@@ -124,7 +124,7 @@ endif;
 									'after'  => '</div>',
 								)
 							);
-?>
+							?>
 						</div><!-- .entry-description -->
 
 					</div><!-- .entry-content -->
diff --git a/wp-content/themes/twentytwelve/inc/custom-header.php b/wp-content/themes/twentytwelve/inc/custom-header.php
index c243dc65a9..636309b7c9 100644
--- a/wp-content/themes/twentytwelve/inc/custom-header.php
+++ b/wp-content/themes/twentytwelve/inc/custom-header.php
@@ -81,17 +81,17 @@ function twentytwelve_header_style() {
 	<?php
 		// Has the text been hidden?
 	if ( ! display_header_text() ) :
-	?>
+		?>
 	.site-title,
 	.site-description {
 		position: absolute;
 		clip: rect(1px 1px 1px 1px); /* IE7 */
 		clip: rect(1px, 1px, 1px, 1px);
 	}
-	<?php
-	// If the user has set a custom color for the text, use that.
+		<?php
+		// If the user has set a custom color for the text, use that.
 		else :
-	?>
+			?>
 		.site-header h1 a,
 		.site-header h2 {
 			color: #<?php echo $text_color; ?>;
@@ -107,7 +107,7 @@ function twentytwelve_header_style() {
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_admin_header_style() {
-?>
+	?>
 	<style type="text/css" id="twentytwelve-admin-header-css">
 	.appearance_page_custom-header #headimg {
 		border: none;
@@ -138,7 +138,7 @@ function twentytwelve_admin_header_style() {
 		max-width: <?php echo get_theme_support( 'custom-header', 'max-width' ); ?>px;
 	}
 	</style>
-<?php
+	<?php
 }
 
 /**
@@ -160,9 +160,9 @@ function twentytwelve_admin_header_image() {
 		<?php
 		$header_image = get_header_image();
 		if ( ! empty( $header_image ) ) :
-		?>
+			?>
 			<img src="<?php echo esc_url( $header_image ); ?>" class="header-image" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="" />
 		<?php endif; ?>
 	</div>
-<?php
+	<?php
 }
diff --git a/wp-content/themes/twentytwelve/index.php b/wp-content/themes/twentytwelve/index.php
index 47e5c6424a..e201be0ca1 100644
--- a/wp-content/themes/twentytwelve/index.php
+++ b/wp-content/themes/twentytwelve/index.php
@@ -24,7 +24,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
@@ -37,7 +37,7 @@ get_header(); ?>
 			<?php
 			if ( current_user_can( 'edit_posts' ) ) :
 				// Show a different message to a logged-in user who can add posts.
-			?>
+				?>
 				<header class="entry-header">
 					<h1 class="entry-title"><?php _e( 'No posts to display', 'twentytwelve' ); ?></h1>
 				</header>
@@ -46,10 +46,10 @@ get_header(); ?>
 					<p><?php printf( __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwelve' ), admin_url( 'post-new.php' ) ); ?></p>
 				</div><!-- .entry-content -->
 
-			<?php
+				<?php
 			else :
 				// Show the default message to everyone else.
-			?>
+				?>
 				<header class="entry-header">
 					<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1>
 				</header>
diff --git a/wp-content/themes/twentytwelve/page-templates/front-page.php b/wp-content/themes/twentytwelve/page-templates/front-page.php
index 9561179a29..72efd0102b 100644
--- a/wp-content/themes/twentytwelve/page-templates/front-page.php
+++ b/wp-content/themes/twentytwelve/page-templates/front-page.php
@@ -20,7 +20,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php if ( has_post_thumbnail() ) : ?>
 					<div class="entry-page-image">
 						<?php the_post_thumbnail(); ?>
diff --git a/wp-content/themes/twentytwelve/page-templates/full-width.php b/wp-content/themes/twentytwelve/page-templates/full-width.php
index 463d923d31..13a1b39be9 100644
--- a/wp-content/themes/twentytwelve/page-templates/full-width.php
+++ b/wp-content/themes/twentytwelve/page-templates/full-width.php
@@ -22,7 +22,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', 'page' ); ?>
 				<?php comments_template( '', true ); ?>
 			<?php endwhile; // end of the loop. ?>
diff --git a/wp-content/themes/twentytwelve/page.php b/wp-content/themes/twentytwelve/page.php
index 32934195d0..cf75606bd2 100644
--- a/wp-content/themes/twentytwelve/page.php
+++ b/wp-content/themes/twentytwelve/page.php
@@ -20,7 +20,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', 'page' ); ?>
 				<?php comments_template( '', true ); ?>
 			<?php endwhile; // end of the loop. ?>
diff --git a/wp-content/themes/twentytwelve/search.php b/wp-content/themes/twentytwelve/search.php
index 9f40217061..39ca14b18f 100644
--- a/wp-content/themes/twentytwelve/search.php
+++ b/wp-content/themes/twentytwelve/search.php
@@ -24,7 +24,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentytwelve/single.php b/wp-content/themes/twentytwelve/single.php
index 17a900c38b..10165cec39 100644
--- a/wp-content/themes/twentytwelve/single.php
+++ b/wp-content/themes/twentytwelve/single.php
@@ -15,7 +15,7 @@ get_header(); ?>
 			<?php
 			while ( have_posts() ) :
 				the_post();
-?>
+				?>
 
 				<?php get_template_part( 'content', get_post_format() ); ?>
 
diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index 70cca8d2da..ca26994acc 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -1077,7 +1077,7 @@ function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
 function wp_admin_bar_header() {
 	?>
 <style type="text/css" media="print">#wpadminbar { display:none; }</style>
-<?php
+	<?php
 }
 
 /**
@@ -1087,7 +1087,7 @@ function wp_admin_bar_header() {
  */
 function _admin_bar_bump_cb() {
 
-?>
+	?>
 <style type="text/css" media="screen">
 	html { margin-top: 32px !important; }
 	* html body { margin-top: 32px !important; }
@@ -1096,7 +1096,7 @@ function _admin_bar_bump_cb() {
 		* html body { margin-top: 46px !important; }
 	}
 </style>
-<?php
+	<?php
 }
 
 /**
diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index 9ef4dac0c6..43945cde8a 100644
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -63,7 +63,8 @@ function the_author( $deprecated = '', $deprecated_echo = true ) {
 
 	if ( true !== $deprecated_echo ) {
 		_deprecated_argument(
-			__FUNCTION__, '1.5.0',
+			__FUNCTION__,
+			'1.5.0',
 			/* translators: %s: get_the_author() */
 			sprintf(
 				__( 'Use %s instead if you do not want the value echoed.' ),
diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php
index 3545ecb8a1..4b845190ad 100644
--- a/wp-includes/bookmark-template.php
+++ b/wp-includes/bookmark-template.php
@@ -237,7 +237,8 @@ function wp_list_bookmarks( $args = '' ) {
 
 	if ( $r['categorize'] ) {
 		$cats = get_terms(
-			'link_category', array(
+			'link_category',
+			array(
 				'name__like'   => $r['category_name'],
 				'include'      => $r['category'],
 				'exclude'      => $r['exclude_category'],
diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index ad219c2711..36ff32053b 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -416,8 +416,10 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 	$redirect['path'] = preg_replace( '|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path'] );
 
 	$punctuation_pattern = implode(
-		'|', array_map(
-			'preg_quote', array(
+		'|',
+		array_map(
+			'preg_quote',
+			array(
 				' ',
 				'%20',  // space
 				'!',
diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 9e4ae834a0..dac1f5a55d 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -353,7 +353,8 @@ function wp_dropdown_categories( $args = '' ) {
 	// Back compat.
 	if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
 		_deprecated_argument(
-			__FUNCTION__, '3.0.0',
+			__FUNCTION__,
+			'3.0.0',
 			/* translators: 1: "type => link", 2: "taxonomy => link_category" */
 			sprintf(
 				__( '%1$s is deprecated. Use %2$s instead.' ),
@@ -698,8 +699,10 @@ function wp_tag_cloud( $args = '' ) {
 	$args     = wp_parse_args( $args, $defaults );
 
 	$tags = get_terms(
-		$args['taxonomy'], array_merge(
-			$args, array(
+		$args['taxonomy'],
+		array_merge(
+			$args,
+			array(
 				'orderby' => 'count',
 				'order'   => 'DESC',
 			)
diff --git a/wp-includes/category.php b/wp-includes/category.php
index 0258353672..6f4700a259 100644
--- a/wp-includes/category.php
+++ b/wp-includes/category.php
@@ -42,7 +42,8 @@ function get_categories( $args = '' ) {
 	// Back compat
 	if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
 		_deprecated_argument(
-			__FUNCTION__, '3.0.0',
+			__FUNCTION__,
+			'3.0.0',
 			/* translators: 1: "type => link", 2: "taxonomy => link_category" */
 			sprintf(
 				__( '%1$s is deprecated. Use %2$s instead.' ),
@@ -134,7 +135,8 @@ function get_category_by_path( $category_path, $full_match = true, $output = OBJ
 		$full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
 	}
 	$categories = get_terms(
-		'category', array(
+		'category',
+		array(
 			'get'  => 'all',
 			'slug' => $leaf_path,
 		)
diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index e935a8d807..e351ba8563 100644
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -451,7 +451,8 @@ class WP_oEmbed {
 			 *                         used by at least Vimeo).
 			 */
 			$linktypes = apply_filters(
-				'oembed_linktypes', array(
+				'oembed_linktypes',
+				array(
 					'application/json+oembed' => 'json',
 					'text/xml+oembed'         => 'xml',
 					'application/xml+oembed'  => 'xml',
diff --git a/wp-includes/class-walker-category.php b/wp-includes/class-walker-category.php
index 5373b7d6dc..e9975ef1af 100644
--- a/wp-includes/class-walker-category.php
+++ b/wp-includes/class-walker-category.php
@@ -168,7 +168,8 @@ class Walker_Category extends Walker {
 			if ( ! empty( $args['current_category'] ) ) {
 				// 'current_category' can be an array, so we use `get_terms()`.
 				$_current_terms = get_terms(
-					$category->taxonomy, array(
+					$category->taxonomy,
+					array(
 						'include'    => $args['current_category'],
 						'hide_empty' => false,
 					)
diff --git a/wp-includes/class-walker-comment.php b/wp-includes/class-walker-comment.php
index e5cb37285c..5bfcac0ed3 100644
--- a/wp-includes/class-walker-comment.php
+++ b/wp-includes/class-walker-comment.php
@@ -236,12 +236,12 @@ class Walker_Comment extends Walker {
 	 */
 	protected function ping( $comment, $depth, $args ) {
 		$tag = ( 'div' == $args['style'] ) ? 'div' : 'li';
-?>
+		?>
 		<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( '', $comment ); ?>>
 			<div class="comment-body">
 				<?php _e( 'Pingback:' ); ?> <?php comment_author_link( $comment ); ?> <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
 			</div>
-<?php
+		<?php
 	}
 
 	/**
@@ -263,7 +263,7 @@ class Walker_Comment extends Walker {
 			$tag       = 'li';
 			$add_below = 'div-comment';
 		}
-?>
+		?>
 		<<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?> id="comment-<?php comment_ID(); ?>">
 		<?php if ( 'div' != $args['style'] ) : ?>
 		<div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
@@ -272,7 +272,7 @@ class Walker_Comment extends Walker {
 			<?php
 			if ( 0 != $args['avatar_size'] ) {
 				echo get_avatar( $comment, $args['avatar_size'] );}
-?>
+			?>
 			<?php
 				/* translators: %s: comment author link */
 				printf(
@@ -290,29 +290,32 @@ class Walker_Comment extends Walker {
 			<?php
 				/* translators: 1: comment date, 2: comment time */
 				printf( __( '%1$s at %2$s' ), get_comment_date( '', $comment ), get_comment_time() );
-				?>
+			?>
 				</a>
 				<?php
 				edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
-			?>
+				?>
 		</div>
 
 		<?php
 		comment_text(
-			$comment, array_merge(
-				$args, array(
+			$comment,
+			array_merge(
+				$args,
+				array(
 					'add_below' => $add_below,
 					'depth'     => $depth,
 					'max_depth' => $args['max_depth'],
 				)
 			)
 		);
-?>
+		?>
 
 		<?php
 		comment_reply_link(
 			array_merge(
-				$args, array(
+				$args,
+				array(
 					'add_below' => $add_below,
 					'depth'     => $depth,
 					'max_depth' => $args['max_depth'],
@@ -326,7 +329,7 @@ class Walker_Comment extends Walker {
 		<?php if ( 'div' != $args['style'] ) : ?>
 		</div>
 		<?php endif; ?>
-<?php
+		<?php
 	}
 
 	/**
@@ -342,7 +345,7 @@ class Walker_Comment extends Walker {
 	 */
 	protected function html5_comment( $comment, $depth, $args ) {
 		$tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
-?>
+		?>
 		<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
 			<article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
 				<footer class="comment-meta">
@@ -350,7 +353,7 @@ class Walker_Comment extends Walker {
 						<?php
 						if ( 0 != $args['avatar_size'] ) {
 							echo get_avatar( $comment, $args['avatar_size'] );}
-?>
+						?>
 						<?php
 							/* translators: %s: comment author link */
 							printf(
@@ -384,7 +387,8 @@ class Walker_Comment extends Walker {
 				<?php
 				comment_reply_link(
 					array_merge(
-						$args, array(
+						$args,
+						array(
 							'add_below' => 'div-comment',
 							'depth'     => $depth,
 							'max_depth' => $args['max_depth'],
@@ -395,6 +399,6 @@ class Walker_Comment extends Walker {
 				);
 				?>
 			</article><!-- .comment-body -->
-<?php
+		<?php
 	}
 }
diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 10cee68c46..256e68a036 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -1478,7 +1478,8 @@ final class WP_Customize_Manager {
 			}
 
 			$this->set_post_value(
-				$nav_menu_setting_id, array(
+				$nav_menu_setting_id,
+				array(
 					'name' => isset( $nav_menu['name'] ) ? $nav_menu['name'] : $nav_menu_location,
 				)
 			);
@@ -2276,7 +2277,8 @@ final class WP_Customize_Manager {
 	 */
 	public function validate_setting_values( $setting_values, $options = array() ) {
 		$options = wp_parse_args(
-			$options, array(
+			$options,
+			array(
 				'validate_capability' => false,
 				'validate_existence'  => false,
 			)
@@ -2713,7 +2715,8 @@ final class WP_Customize_Manager {
 			$post_values
 		);
 		$setting_validities    = $this->validate_setting_values(
-			$validated_values, array(
+			$validated_values,
+			array(
 				'validate_capability' => true,
 				'validate_existence'  => true,
 			)
@@ -4014,14 +4017,14 @@ final class WP_Customize_Manager {
 		if ( $this->branching() ) {
 			$l10n = array(
 				/* translators: %s: User who is customizing the changeset in customizer. */
-				'locked' => __( '%s is already customizing this changeset. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
+				'locked'                => __( '%s is already customizing this changeset. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
 				/* translators: %s: User who is customizing the changeset in customizer. */
 				'locked_allow_override' => __( '%s is already customizing this changeset. Do you want to take over?' ),
 			);
 		} else {
 			$l10n = array(
 				/* translators: %s: User who is customizing the changeset in customizer. */
-				'locked' => __( '%s is already customizing this site. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
+				'locked'                => __( '%s is already customizing this site. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
 				/* translators: %s: User who is customizing the changeset in customizer. */
 				'locked_allow_override' => __( '%s is already customizing this site. Do you want to take over?' ),
 			);
@@ -4029,7 +4032,9 @@ final class WP_Customize_Manager {
 
 		foreach ( $this->registered_control_types as $control_type ) {
 			$control = new $control_type(
-				$this, 'temp', array(
+				$this,
+				'temp',
+				array(
 					'settings' => array(),
 				)
 			);
@@ -4306,10 +4311,13 @@ final class WP_Customize_Manager {
 
 		$controls       = array();
 		$this->controls = wp_list_sort(
-			$this->controls, array(
+			$this->controls,
+			array(
 				'priority'        => 'ASC',
 				'instance_number' => 'ASC',
-			), 'ASC', true
+			),
+			'ASC',
+			true
 		);
 
 		foreach ( $this->controls as $id => $control ) {
@@ -4324,10 +4332,13 @@ final class WP_Customize_Manager {
 
 		// Prepare sections.
 		$this->sections = wp_list_sort(
-			$this->sections, array(
+			$this->sections,
+			array(
 				'priority'        => 'ASC',
 				'instance_number' => 'ASC',
-			), 'ASC', true
+			),
+			'ASC',
+			true
 		);
 		$sections       = array();
 
@@ -4337,7 +4348,8 @@ final class WP_Customize_Manager {
 			}
 
 			$section->controls = wp_list_sort(
-				$section->controls, array(
+				$section->controls,
+				array(
 					'priority'        => 'ASC',
 					'instance_number' => 'ASC',
 				)
@@ -4357,10 +4369,13 @@ final class WP_Customize_Manager {
 
 		// Prepare panels.
 		$this->panels = wp_list_sort(
-			$this->panels, array(
+			$this->panels,
+			array(
 				'priority'        => 'ASC',
 				'instance_number' => 'ASC',
-			), 'ASC', true
+			),
+			'ASC',
+			true
 		);
 		$panels       = array();
 
@@ -4370,10 +4385,13 @@ final class WP_Customize_Manager {
 			}
 
 			$panel->sections      = wp_list_sort(
-				$panel->sections, array(
+				$panel->sections,
+				array(
 					'priority'        => 'ASC',
 					'instance_number' => 'ASC',
-				), 'ASC', true
+				),
+				'ASC',
+				true
 			);
 			$panels[ $panel->id ] = $panel;
 		}
@@ -4382,10 +4400,13 @@ final class WP_Customize_Manager {
 		// Sort panels and top-level sections together.
 		$this->containers = array_merge( $this->panels, $this->sections );
 		$this->containers = wp_list_sort(
-			$this->containers, array(
+			$this->containers,
+			array(
 				'priority'        => 'ASC',
 				'instance_number' => 'ASC',
-			), 'ASC', true
+			),
+			'ASC',
+			true
 		);
 	}
 
@@ -4402,7 +4423,9 @@ final class WP_Customize_Manager {
 		if ( ! is_multisite() && ( current_user_can( 'install_themes' ) || current_user_can( 'update_themes' ) || current_user_can( 'delete_themes' ) ) ) {
 			wp_enqueue_script( 'updates' );
 			wp_localize_script(
-				'updates', '_wpUpdatesItemCounts', array(
+				'updates',
+				'_wpUpdatesItemCounts',
+				array(
 					'totals' => wp_get_update_data(),
 				)
 			);
@@ -4642,7 +4665,8 @@ final class WP_Customize_Manager {
 			array(
 				'interim-login'   => 1,
 				'customize-login' => 1,
-			), wp_login_url()
+			),
+			wp_login_url()
 		);
 
 		// Ensure dirty flags are set for modified settings.
@@ -4840,7 +4864,7 @@ final class WP_Customize_Manager {
 				}
 			}
 			echo "})( _wpCustomizeSettings.controls );\n";
-		?>
+			?>
 		</script>
 		<?php
 	}
@@ -4891,7 +4915,9 @@ final class WP_Customize_Manager {
 
 		$this->add_panel(
 			new WP_Customize_Themes_Panel(
-				$this, 'themes', array(
+				$this,
+				'themes',
+				array(
 					'title'       => $this->theme()->display( 'Name' ),
 					'description' => (
 					'<p>' . __( 'Looking for a theme? You can search or browse the WordPress.org theme directory, install and preview themes, then activate them right here.' ) . '</p>' .
@@ -4905,7 +4931,9 @@ final class WP_Customize_Manager {
 
 		$this->add_section(
 			new WP_Customize_Themes_Section(
-				$this, 'installed_themes', array(
+				$this,
+				'installed_themes',
+				array(
 					'title'      => __( 'Installed themes' ),
 					'action'     => 'installed',
 					'capability' => 'switch_themes',
@@ -4918,7 +4946,9 @@ final class WP_Customize_Manager {
 		if ( ! is_multisite() ) {
 			$this->add_section(
 				new WP_Customize_Themes_Section(
-					$this, 'wporg_themes', array(
+					$this,
+					'wporg_themes',
+					array(
 						'title'       => __( 'WordPress.org themes' ),
 						'action'      => 'wporg',
 						'filter_type' => 'remote',
@@ -4933,7 +4963,9 @@ final class WP_Customize_Manager {
 		// Themes Setting (unused - the theme is considerably more fundamental to the Customizer experience).
 		$this->add_setting(
 			new WP_Customize_Filter_Setting(
-				$this, 'active_theme', array(
+				$this,
+				'active_theme',
+				array(
 					'capability' => 'switch_themes',
 				)
 			)
@@ -4942,14 +4974,16 @@ final class WP_Customize_Manager {
 		/* Site Identity */
 
 		$this->add_section(
-			'title_tagline', array(
+			'title_tagline',
+			array(
 				'title'    => __( 'Site Identity' ),
 				'priority' => 20,
 			)
 		);
 
 		$this->add_setting(
-			'blogname', array(
+			'blogname',
+			array(
 				'default'    => get_option( 'blogname' ),
 				'type'       => 'option',
 				'capability' => 'manage_options',
@@ -4957,14 +4991,16 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_control(
-			'blogname', array(
+			'blogname',
+			array(
 				'label'   => __( 'Site Title' ),
 				'section' => 'title_tagline',
 			)
 		);
 
 		$this->add_setting(
-			'blogdescription', array(
+			'blogdescription',
+			array(
 				'default'    => get_option( 'blogdescription' ),
 				'type'       => 'option',
 				'capability' => 'manage_options',
@@ -4972,7 +5008,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_control(
-			'blogdescription', array(
+			'blogdescription',
+			array(
 				'label'   => __( 'Tagline' ),
 				'section' => 'title_tagline',
 			)
@@ -4981,7 +5018,8 @@ final class WP_Customize_Manager {
 		// Add a setting to hide header text if the theme doesn't support custom headers.
 		if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
 			$this->add_setting(
-				'header_text', array(
+				'header_text',
+				array(
 					'theme_supports'    => array( 'custom-logo', 'header-text' ),
 					'default'           => 1,
 					'sanitize_callback' => 'absint',
@@ -4989,7 +5027,8 @@ final class WP_Customize_Manager {
 			);
 
 			$this->add_control(
-				'header_text', array(
+				'header_text',
+				array(
 					'label'    => __( 'Display Site Title and Tagline' ),
 					'section'  => 'title_tagline',
 					'settings' => 'header_text',
@@ -4999,7 +5038,8 @@ final class WP_Customize_Manager {
 		}
 
 		$this->add_setting(
-			'site_icon', array(
+			'site_icon',
+			array(
 				'type'       => 'option',
 				'capability' => 'manage_options',
 				'transport'  => 'postMessage', // Previewed with JS in the Customizer controls window.
@@ -5008,7 +5048,9 @@ final class WP_Customize_Manager {
 
 		$this->add_control(
 			new WP_Customize_Site_Icon_Control(
-				$this, 'site_icon', array(
+				$this,
+				'site_icon',
+				array(
 					'label'       => __( 'Site Icon' ),
 					'description' => sprintf(
 						'<p>' . __( 'Site Icons are what you see in browser tabs, bookmark bars, and within the WordPress mobile apps. Upload one here!' ) . '</p>' .
@@ -5025,7 +5067,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'custom_logo', array(
+			'custom_logo',
+			array(
 				'theme_supports' => array( 'custom-logo' ),
 				'transport'      => 'postMessage',
 			)
@@ -5034,7 +5077,9 @@ final class WP_Customize_Manager {
 		$custom_logo_args = get_theme_support( 'custom-logo' );
 		$this->add_control(
 			new WP_Customize_Cropped_Image_Control(
-				$this, 'custom_logo', array(
+				$this,
+				'custom_logo',
+				array(
 					'label'         => __( 'Logo' ),
 					'section'       => 'title_tagline',
 					'priority'      => 8,
@@ -5056,7 +5101,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->selective_refresh->add_partial(
-			'custom_logo', array(
+			'custom_logo',
+			array(
 				'settings'            => array( 'custom_logo' ),
 				'selector'            => '.custom-logo-link',
 				'render_callback'     => array( $this, '_render_custom_logo_partial' ),
@@ -5067,14 +5113,16 @@ final class WP_Customize_Manager {
 		/* Colors */
 
 		$this->add_section(
-			'colors', array(
+			'colors',
+			array(
 				'title'    => __( 'Colors' ),
 				'priority' => 40,
 			)
 		);
 
 		$this->add_setting(
-			'header_textcolor', array(
+			'header_textcolor',
+			array(
 				'theme_supports'       => array( 'custom-header', 'header-text' ),
 				'default'              => get_theme_support( 'custom-header', 'default-text-color' ),
 
@@ -5086,7 +5134,8 @@ final class WP_Customize_Manager {
 		// Input type: checkbox
 		// With custom value
 		$this->add_control(
-			'display_header_text', array(
+			'display_header_text',
+			array(
 				'settings' => 'header_textcolor',
 				'label'    => __( 'Display Site Title and Tagline' ),
 				'section'  => 'title_tagline',
@@ -5097,7 +5146,9 @@ final class WP_Customize_Manager {
 
 		$this->add_control(
 			new WP_Customize_Color_Control(
-				$this, 'header_textcolor', array(
+				$this,
+				'header_textcolor',
+				array(
 					'label'   => __( 'Header Text Color' ),
 					'section' => 'colors',
 				)
@@ -5107,7 +5158,8 @@ final class WP_Customize_Manager {
 		// Input type: Color
 		// With sanitize_callback
 		$this->add_setting(
-			'background_color', array(
+			'background_color',
+			array(
 				'default'              => get_theme_support( 'custom-background', 'default-color' ),
 				'theme_supports'       => 'custom-background',
 
@@ -5118,7 +5170,9 @@ final class WP_Customize_Manager {
 
 		$this->add_control(
 			new WP_Customize_Color_Control(
-				$this, 'background_color', array(
+				$this,
+				'background_color',
+				array(
 					'label'   => __( 'Background Color' ),
 					'section' => 'colors',
 				)
@@ -5162,7 +5216,8 @@ final class WP_Customize_Manager {
 		}
 
 		$this->add_section(
-			'header_image', array(
+			'header_image',
+			array(
 				'title'          => $title,
 				'description'    => $description,
 				'theme_supports' => 'custom-header',
@@ -5171,7 +5226,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'header_video', array(
+			'header_video',
+			array(
 				'theme_supports'    => array( 'custom-header', 'video' ),
 				'transport'         => 'postMessage',
 				'sanitize_callback' => 'absint',
@@ -5180,7 +5236,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'external_header_video', array(
+			'external_header_video',
+			array(
 				'theme_supports'    => array( 'custom-header', 'video' ),
 				'transport'         => 'postMessage',
 				'sanitize_callback' => array( $this, '_sanitize_external_header_video' ),
@@ -5190,7 +5247,9 @@ final class WP_Customize_Manager {
 
 		$this->add_setting(
 			new WP_Customize_Filter_Setting(
-				$this, 'header_image', array(
+				$this,
+				'header_image',
+				array(
 					'default'        => sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() ),
 					'theme_supports' => 'custom-header',
 				)
@@ -5199,7 +5258,9 @@ final class WP_Customize_Manager {
 
 		$this->add_setting(
 			new WP_Customize_Header_Image_Setting(
-				$this, 'header_image_data', array(
+				$this,
+				'header_image_data',
+				array(
 					'theme_supports' => 'custom-header',
 				)
 			)
@@ -5217,7 +5278,9 @@ final class WP_Customize_Manager {
 
 		$this->add_control(
 			new WP_Customize_Media_Control(
-				$this, 'header_video', array(
+				$this,
+				'header_video',
+				array(
 					'theme_supports'  => array( 'custom-header', 'video' ),
 					'label'           => __( 'Header Video' ),
 					'description'     => $control_description,
@@ -5229,7 +5292,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_control(
-			'external_header_video', array(
+			'external_header_video',
+			array(
 				'theme_supports'  => array( 'custom-header', 'video' ),
 				'type'            => 'url',
 				'description'     => __( 'Or, enter a YouTube URL:' ),
@@ -5241,7 +5305,8 @@ final class WP_Customize_Manager {
 		$this->add_control( new WP_Customize_Header_Image_Control( $this ) );
 
 		$this->selective_refresh->add_partial(
-			'custom_header', array(
+			'custom_header',
+			array(
 				'selector'            => '#wp-custom-header',
 				'render_callback'     => 'the_custom_header_markup',
 				'settings'            => array( 'header_video', 'external_header_video', 'header_image' ), // The image is used as a video fallback here.
@@ -5252,7 +5317,8 @@ final class WP_Customize_Manager {
 		/* Custom Background */
 
 		$this->add_section(
-			'background_image', array(
+			'background_image',
+			array(
 				'title'          => __( 'Background Image' ),
 				'theme_supports' => 'custom-background',
 				'priority'       => 80,
@@ -5260,7 +5326,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'background_image', array(
+			'background_image',
+			array(
 				'default'           => get_theme_support( 'custom-background', 'default-image' ),
 				'theme_supports'    => 'custom-background',
 				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
@@ -5269,7 +5336,9 @@ final class WP_Customize_Manager {
 
 		$this->add_setting(
 			new WP_Customize_Background_Image_Setting(
-				$this, 'background_image_thumb', array(
+				$this,
+				'background_image_thumb',
+				array(
 					'theme_supports'    => 'custom-background',
 					'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
 				)
@@ -5279,7 +5348,8 @@ final class WP_Customize_Manager {
 		$this->add_control( new WP_Customize_Background_Image_Control( $this ) );
 
 		$this->add_setting(
-			'background_preset', array(
+			'background_preset',
+			array(
 				'default'           => get_theme_support( 'custom-background', 'default-preset' ),
 				'theme_supports'    => 'custom-background',
 				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
@@ -5287,7 +5357,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_control(
-			'background_preset', array(
+			'background_preset',
+			array(
 				'label'   => _x( 'Preset', 'Background Preset' ),
 				'section' => 'background_image',
 				'type'    => 'select',
@@ -5302,7 +5373,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'background_position_x', array(
+			'background_position_x',
+			array(
 				'default'           => get_theme_support( 'custom-background', 'default-position-x' ),
 				'theme_supports'    => 'custom-background',
 				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
@@ -5310,7 +5382,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'background_position_y', array(
+			'background_position_y',
+			array(
 				'default'           => get_theme_support( 'custom-background', 'default-position-y' ),
 				'theme_supports'    => 'custom-background',
 				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
@@ -5319,7 +5392,9 @@ final class WP_Customize_Manager {
 
 		$this->add_control(
 			new WP_Customize_Background_Position_Control(
-				$this, 'background_position', array(
+				$this,
+				'background_position',
+				array(
 					'label'    => __( 'Image Position' ),
 					'section'  => 'background_image',
 					'settings' => array(
@@ -5331,7 +5406,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'background_size', array(
+			'background_size',
+			array(
 				'default'           => get_theme_support( 'custom-background', 'default-size' ),
 				'theme_supports'    => 'custom-background',
 				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
@@ -5339,7 +5415,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_control(
-			'background_size', array(
+			'background_size',
+			array(
 				'label'   => __( 'Image Size' ),
 				'section' => 'background_image',
 				'type'    => 'select',
@@ -5352,7 +5429,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'background_repeat', array(
+			'background_repeat',
+			array(
 				'default'           => get_theme_support( 'custom-background', 'default-repeat' ),
 				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
 				'theme_supports'    => 'custom-background',
@@ -5360,7 +5438,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_control(
-			'background_repeat', array(
+			'background_repeat',
+			array(
 				'label'   => __( 'Repeat Background Image' ),
 				'section' => 'background_image',
 				'type'    => 'checkbox',
@@ -5368,7 +5447,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'background_attachment', array(
+			'background_attachment',
+			array(
 				'default'           => get_theme_support( 'custom-background', 'default-attachment' ),
 				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
 				'theme_supports'    => 'custom-background',
@@ -5376,7 +5456,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_control(
-			'background_attachment', array(
+			'background_attachment',
+			array(
 				'label'   => __( 'Scroll with Page' ),
 				'section' => 'background_image',
 				'type'    => 'checkbox',
@@ -5398,7 +5479,8 @@ final class WP_Customize_Manager {
 		 */
 
 		$this->add_section(
-			'static_front_page', array(
+			'static_front_page',
+			array(
 				'title'           => __( 'Homepage Settings' ),
 				'priority'        => 120,
 				'description'     => __( 'You can choose what&#8217;s displayed on the homepage of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static homepage, you first need to create two Pages. One will become the homepage, and the other will be where your posts are displayed.' ),
@@ -5407,7 +5489,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'show_on_front', array(
+			'show_on_front',
+			array(
 				'default'    => get_option( 'show_on_front' ),
 				'capability' => 'manage_options',
 				'type'       => 'option',
@@ -5415,7 +5498,8 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_control(
-			'show_on_front', array(
+			'show_on_front',
+			array(
 				'label'   => __( 'Your homepage displays' ),
 				'section' => 'static_front_page',
 				'type'    => 'radio',
@@ -5427,14 +5511,16 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'page_on_front', array(
+			'page_on_front',
+			array(
 				'type'       => 'option',
 				'capability' => 'manage_options',
 			)
 		);
 
 		$this->add_control(
-			'page_on_front', array(
+			'page_on_front',
+			array(
 				'label'          => __( 'Homepage' ),
 				'section'        => 'static_front_page',
 				'type'           => 'dropdown-pages',
@@ -5443,14 +5529,16 @@ final class WP_Customize_Manager {
 		);
 
 		$this->add_setting(
-			'page_for_posts', array(
+			'page_for_posts',
+			array(
 				'type'       => 'option',
 				'capability' => 'manage_options',
 			)
 		);
 
 		$this->add_control(
-			'page_for_posts', array(
+			'page_for_posts',
+			array(
 				'label'          => __( 'Posts page' ),
 				'section'        => 'static_front_page',
 				'type'           => 'dropdown-pages',
@@ -5498,7 +5586,8 @@ final class WP_Customize_Manager {
 		$section_description .= '</p>';
 
 		$this->add_section(
-			'custom_css', array(
+			'custom_css',
+			array(
 				'title'              => __( 'Additional CSS' ),
 				'priority'           => 200,
 				'description_hidden' => true,
@@ -5507,7 +5596,9 @@ final class WP_Customize_Manager {
 		);
 
 		$custom_css_setting = new WP_Customize_Custom_CSS_Setting(
-			$this, sprintf( 'custom_css[%s]', get_stylesheet() ), array(
+			$this,
+			sprintf( 'custom_css[%s]', get_stylesheet() ),
+			array(
 				'capability' => 'edit_css',
 				'default'    => '',
 			)
@@ -5516,7 +5607,9 @@ final class WP_Customize_Manager {
 
 		$this->add_control(
 			new WP_Customize_Code_Editor_Control(
-				$this, 'custom_css', array(
+				$this,
+				'custom_css',
+				array(
 					'label'       => __( 'CSS code' ),
 					'section'     => 'custom_css',
 					'settings'    => array( 'default' => $custom_css_setting->id ),
@@ -5659,7 +5752,8 @@ final class WP_Customize_Manager {
 					array(
 						'theme'    => $theme->slug,
 						'_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug ),
-					), $update_php
+					),
+					$update_php
 				);
 
 				$theme->name        = wp_kses( $theme->name, $themes_allowedtags );
@@ -5832,7 +5926,8 @@ final class WP_Customize_Manager {
 			}
 			if ( '.mp4' !== substr( $video, -4 ) && '.mov' !== substr( $video, -4 ) ) { // Check for .mp4 or .mov format, which (assuming h.264 encoding) are the only cross-browser-supported formats.
 				$validity->add(
-					'invalid_file_type', sprintf(
+					'invalid_file_type',
+					sprintf(
 						/* translators: 1: .mp4, 2: .mov */
 						__( 'Only %1$s or %2$s files may be used for header video. Please convert your video file and try again, or, upload your video to YouTube and link it with the option below.' ),
 						'<code>.mp4</code>',
diff --git a/wp-includes/class-wp-customize-nav-menus.php b/wp-includes/class-wp-customize-nav-menus.php
index d2a346d5b0..cb2f137868 100644
--- a/wp-includes/class-wp-customize-nav-menus.php
+++ b/wp-includes/class-wp-customize-nav-menus.php
@@ -180,7 +180,8 @@ final class WP_Customize_Nav_Menus {
 			}
 
 			$posts = array_merge(
-				$posts, get_posts(
+				$posts,
+				get_posts(
 					array(
 						'numberposts' => 10,
 						'offset'      => 10 * $page,
@@ -209,7 +210,8 @@ final class WP_Customize_Nav_Menus {
 			}
 		} elseif ( 'taxonomy' === $type ) {
 			$terms = get_terms(
-				$object, array(
+				$object,
+				array(
 					'child_of'     => 0,
 					'exclude'      => '',
 					'hide_empty'   => false,
@@ -363,7 +365,8 @@ final class WP_Customize_Nav_Menus {
 		// Query taxonomy terms.
 		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'names' );
 		$terms      = get_terms(
-			$taxonomies, array(
+			$taxonomies,
+			array(
 				'name__like' => $args['s'],
 				'number'     => 20,
 				'offset'     => 20 * ( $args['pagenum'] - 1 ),
@@ -387,7 +390,7 @@ final class WP_Customize_Nav_Menus {
 
 		// Add "Home" link if search term matches. Treat as a page, but switch to custom on add.
 		if ( isset( $args['s'] ) ) {
-			$title = _x( 'Home', 'nav menu home label' );
+			$title   = _x( 'Home', 'nav menu home label' );
 			$matches = function_exists( 'mb_stripos' ) ? false !== mb_stripos( $title, $args['s'] ) : false !== stripos( $title, $args['s'] );
 			if ( $matches ) {
 				$items[] = array(
@@ -594,7 +597,9 @@ final class WP_Customize_Nav_Menus {
 		}
 		$this->manager->add_panel(
 			new WP_Customize_Nav_Menus_Panel(
-				$this->manager, 'nav_menus', array(
+				$this->manager,
+				'nav_menus',
+				array(
 					'title'       => __( 'Menus' ),
 					'description' => $description,
 					'priority'    => 100,
@@ -620,7 +625,8 @@ final class WP_Customize_Nav_Menus {
 		}
 
 		$this->manager->add_section(
-			'menu_locations', array(
+			'menu_locations',
+			array(
 				'title'       => 1 === $num_locations ? _x( 'View Location', 'menu locations' ) : _x( 'View All Locations', 'menu locations' ),
 				'panel'       => 'nav_menus',
 				'priority'    => 30,
@@ -656,7 +662,8 @@ final class WP_Customize_Nav_Menus {
 				add_filter( "customize_sanitize_{$setting_id}", array( $this, 'intval_base10' ) );
 			} else {
 				$this->manager->add_setting(
-					$setting_id, array(
+					$setting_id,
+					array(
 						'sanitize_callback' => array( $this, 'intval_base10' ),
 						'theme_supports'    => 'menus',
 						'type'              => 'theme_mod',
@@ -673,7 +680,9 @@ final class WP_Customize_Nav_Menus {
 
 			$this->manager->add_control(
 				new WP_Customize_Nav_Menu_Location_Control(
-					$this->manager, $setting_id, array(
+					$this->manager,
+					$setting_id,
+					array(
 						'label'       => $description,
 						'location_id' => $location,
 						'section'     => 'menu_locations',
@@ -691,7 +700,9 @@ final class WP_Customize_Nav_Menus {
 			$section_id = 'nav_menu[' . $menu_id . ']';
 			$this->manager->add_section(
 				new WP_Customize_Nav_Menu_Section(
-					$this->manager, $section_id, array(
+					$this->manager,
+					$section_id,
+					array(
 						'title'    => html_entity_decode( $menu->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
 						'priority' => 10,
 						'panel'    => 'nav_menus',
@@ -702,7 +713,9 @@ final class WP_Customize_Nav_Menus {
 			$nav_menu_setting_id = 'nav_menu[' . $menu_id . ']';
 			$this->manager->add_setting(
 				new WP_Customize_Nav_Menu_Setting(
-					$this->manager, $nav_menu_setting_id, array(
+					$this->manager,
+					$nav_menu_setting_id,
+					array(
 						'transport' => 'postMessage',
 					)
 				)
@@ -724,7 +737,9 @@ final class WP_Customize_Nav_Menus {
 				$value['nav_menu_term_id'] = $menu_id;
 				$this->manager->add_setting(
 					new WP_Customize_Nav_Menu_Item_Setting(
-						$this->manager, $menu_item_setting_id, array(
+						$this->manager,
+						$menu_item_setting_id,
+						array(
 							'value'     => $value,
 							'transport' => 'postMessage',
 						)
@@ -734,7 +749,9 @@ final class WP_Customize_Nav_Menus {
 				// Create a control for each menu item.
 				$this->manager->add_control(
 					new WP_Customize_Nav_Menu_Item_Control(
-						$this->manager, $menu_item_setting_id, array(
+						$this->manager,
+						$menu_item_setting_id,
+						array(
 							'label'    => $item->title,
 							'section'  => $section_id,
 							'priority' => 10 + $i,
@@ -748,7 +765,8 @@ final class WP_Customize_Nav_Menus {
 
 		// Add the add-new-menu section and controls.
 		$this->manager->add_section(
-			'add_menu', array(
+			'add_menu',
+			array(
 				'type'     => 'new_menu',
 				'title'    => __( 'New Menu' ),
 				'panel'    => 'nav_menus',
@@ -758,7 +776,9 @@ final class WP_Customize_Nav_Menus {
 
 		$this->manager->add_setting(
 			new WP_Customize_Filter_Setting(
-				$this->manager, 'nav_menus_created_posts', array(
+				$this->manager,
+				'nav_menus_created_posts',
+				array(
 					'transport'         => 'postMessage',
 					'type'              => 'option', // To prevent theme prefix in changeset.
 					'default'           => array(),
@@ -1036,7 +1056,7 @@ final class WP_Customize_Nav_Menus {
 				</button>
 			</h3>
 		</script>
-	<?php
+		<?php
 	}
 
 	/**
@@ -1094,7 +1114,7 @@ final class WP_Customize_Nav_Menus {
 			}
 			?>
 		</div><!-- #available-menu-items -->
-	<?php
+		<?php
 	}
 
 	/**
@@ -1120,7 +1140,7 @@ final class WP_Customize_Nav_Menus {
 					<?php
 						/* translators: %s: Title of a section with menu items */
 						printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) );
-						?>
+					?>
 						</span>
 					<span class="toggle-indicator" aria-hidden="true"></span>
 				</button>
diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php
index 93c93efbbd..d45f7c5207 100644
--- a/wp-includes/class-wp-customize-widgets.php
+++ b/wp-includes/class-wp-customize-widgets.php
@@ -401,7 +401,8 @@ final class WP_Customize_Widgets {
 		if ( ! $this->manager->is_theme_active() ) {
 			$setting_id   = 'old_sidebars_widgets_data';
 			$setting_args = $this->get_setting_args(
-				$setting_id, array(
+				$setting_id,
+				array(
 					'type'  => 'global_variable',
 					'dirty' => true,
 				)
@@ -410,7 +411,8 @@ final class WP_Customize_Widgets {
 		}
 
 		$this->manager->add_panel(
-			'widgets', array(
+			'widgets',
+			array(
 				'type'                     => 'widgets',
 				'title'                    => __( 'Widgets' ),
 				'description'              => __( 'Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).' ),
@@ -468,7 +470,9 @@ final class WP_Customize_Widgets {
 					$this->manager->add_section( $section );
 
 					$control           = new WP_Widget_Area_Customize_Control(
-						$this->manager, $setting_id, array(
+						$this->manager,
+						$setting_id,
+						array(
 							'section'    => $section_id,
 							'sidebar_id' => $sidebar_id,
 							'priority'   => count( $sidebar_widget_ids ), // place 'Add Widget' and 'Reorder' buttons at end.
@@ -493,7 +497,9 @@ final class WP_Customize_Widgets {
 				$id_base           = $wp_registered_widget_controls[ $widget_id ]['id_base'];
 
 				$control = new WP_Widget_Form_Customize_Control(
-					$this->manager, $setting_id, array(
+					$this->manager,
+					$setting_id,
+					array(
 						'label'          => $registered_widget['name'],
 						'section'        => $section_id,
 						'sidebar_id'     => $sidebar_id,
@@ -733,7 +739,9 @@ final class WP_Customize_Widgets {
 						$non_rendered_count
 					),
 					number_format_i18n( $non_rendered_count )
-				), ENT_QUOTES, get_bloginfo( 'charset' )
+				),
+				ENT_QUOTES,
+				get_bloginfo( 'charset' )
 			);
 		}
 
@@ -741,7 +749,9 @@ final class WP_Customize_Widgets {
 			$no_areas_shown_message = html_entity_decode(
 				sprintf(
 					__( 'Your theme has 1 widget area, but this particular page doesn&#8217;t display it.' )
-				), ENT_QUOTES, get_bloginfo( 'charset' )
+				),
+				ENT_QUOTES,
+				get_bloginfo( 'charset' )
 			);
 		} else {
 			$no_areas_shown_message = html_entity_decode(
@@ -753,7 +763,9 @@ final class WP_Customize_Widgets {
 						$registered_sidebar_count
 					),
 					number_format_i18n( $registered_sidebar_count )
-				), ENT_QUOTES, get_bloginfo( 'charset' )
+				),
+				ENT_QUOTES,
+				get_bloginfo( 'charset' )
 			);
 		}
 
@@ -990,7 +1002,8 @@ final class WP_Customize_Widgets {
 
 			// The properties here are mapped to the Backbone Widget model.
 			$available_widget = array_merge(
-				$available_widget, array(
+				$available_widget,
+				array(
 					'temp_id'      => isset( $args['_temp_id'] ) ? $args['_temp_id'] : null,
 					'is_multi'     => $is_multi_widget,
 					'control_tpl'  => $control_tpl,
@@ -1703,7 +1716,8 @@ final class WP_Customize_Widgets {
 						'data-customize-partial-placement-context',
 						'data-customize-partial-widget-id',
 						'data-customize-partial-options',
-					), true
+					),
+					true
 				)
 			);
 		}
diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 5b63bf0005..1846214e3c 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -80,7 +80,8 @@ final class _WP_Editors {
 		$settings = apply_filters( 'wp_editor_settings', $settings, $editor_id );
 
 		$set = wp_parse_args(
-			$settings, array(
+			$settings,
+			array(
 				'wpautop'             => true,
 				'media_buttons'       => true,
 				'default_editor'      => '',
@@ -257,7 +258,8 @@ final class _WP_Editors {
 		 * @param string $output Editor's HTML markup.
 		 */
 		$the_editor = apply_filters(
-			'the_editor', '<div id="wp-' . $editor_id_attr . '-editor-container" class="wp-editor-container">' .
+			'the_editor',
+			'<div id="wp-' . $editor_id_attr . '-editor-container" class="wp-editor-container">' .
 			$quicktags_toolbar .
 			'<textarea' . $editor_class . $height . $tabindex . $autocomplete . ' cols="40" name="' . esc_attr( $set['textarea_name'] ) . '" ' .
 			'id="' . $editor_id_attr . '">%s</textarea></div>'
@@ -791,7 +793,8 @@ final class _WP_Editors {
 		 *                       and Quicktags are being loaded.
 		 */
 		do_action(
-			'wp_enqueue_editor', array(
+			'wp_enqueue_editor',
+			array(
 				'tinymce'   => ( $default_scripts || self::$has_tinymce ),
 				'quicktags' => ( $default_scripts || self::$has_quicktags ),
 			)
@@ -847,7 +850,8 @@ final class _WP_Editors {
 			// The 'wpview', 'wpdialogs', and 'media' TinyMCE plugins are not initialized by default.
 			// Can be added from js by using the 'wp-before-tinymce-init' event.
 			$settings['plugins'] = implode(
-				',', array(
+				',',
+				array(
 					'charmap',
 					'colorpicker',
 					'hr',
diff --git a/wp-includes/class-wp-embed.php b/wp-includes/class-wp-embed.php
index 1bf0907ae3..f50d031fb5 100644
--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -85,13 +85,13 @@ class WP_Embed {
 			return;
 		}
 
-?>
+		?>
 <script type="text/javascript">
 	jQuery(document).ready(function($){
 		$.get("<?php echo admin_url( 'admin-ajax.php?action=oembed-cache&post=' . $post->ID, 'relative' ); ?>");
 	});
 </script>
-<?php
+		<?php
 	}
 
 	/**
diff --git a/wp-includes/class-wp-http-curl.php b/wp-includes/class-wp-http-curl.php
index 12508cf5e2..1ee9957743 100644
--- a/wp-includes/class-wp-http-curl.php
+++ b/wp-includes/class-wp-http-curl.php
@@ -189,7 +189,8 @@ class WP_Http_Curl {
 			}
 			if ( ! $this->stream_handle ) {
 				return new WP_Error(
-					'http_request_failed', sprintf(
+					'http_request_failed',
+					sprintf(
 						/* translators: 1: fopen(), 2: file name */
 						__( 'Could not open handle for %1$s to %2$s.' ),
 						'fopen()',
diff --git a/wp-includes/class-wp-http-streams.php b/wp-includes/class-wp-http-streams.php
index 02a3d457b3..7079c0add4 100644
--- a/wp-includes/class-wp-http-streams.php
+++ b/wp-includes/class-wp-http-streams.php
@@ -249,7 +249,8 @@ class WP_Http_Streams {
 			}
 			if ( ! $stream_handle ) {
 				return new WP_Error(
-					'http_request_failed', sprintf(
+					'http_request_failed',
+					sprintf(
 						/* translators: 1: fopen(), 2: file name */
 						__( 'Could not open handle for %1$s to %2$s.' ),
 						'fopen()',
diff --git a/wp-includes/class-wp-meta-query.php b/wp-includes/class-wp-meta-query.php
index fafcf9cbbb..239fcd0bf9 100644
--- a/wp-includes/class-wp-meta-query.php
+++ b/wp-includes/class-wp-meta-query.php
@@ -498,7 +498,8 @@ class WP_Meta_Query {
 		}
 
 		if ( ! in_array(
-			$clause['compare'], array(
+			$clause['compare'],
+			array(
 				'=',
 				'!=',
 				'>',
diff --git a/wp-includes/class-wp-oembed-controller.php b/wp-includes/class-wp-oembed-controller.php
index 8ea6236020..b688601cdd 100644
--- a/wp-includes/class-wp-oembed-controller.php
+++ b/wp-includes/class-wp-oembed-controller.php
@@ -32,7 +32,9 @@ final class WP_oEmbed_Controller {
 		$maxwidth = apply_filters( 'oembed_default_width', 600 );
 
 		register_rest_route(
-			'oembed/1.0', '/embed', array(
+			'oembed/1.0',
+			'/embed',
+			array(
 				array(
 					'methods'  => WP_REST_Server::READABLE,
 					'callback' => array( $this, 'get_item' ),
@@ -55,7 +57,9 @@ final class WP_oEmbed_Controller {
 		);
 
 		register_rest_route(
-			'oembed/1.0', '/proxy', array(
+			'oembed/1.0',
+			'/proxy',
+			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_proxy_item' ),
diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php
index f8ead26246..6a4525a9ee 100644
--- a/wp-includes/class-wp-query.php
+++ b/wp-includes/class-wp-query.php
@@ -1099,14 +1099,16 @@ class WP_Query {
 					$terms = preg_split( '/[+]+/', $term );
 					foreach ( $terms as $term ) {
 						$tax_query[] = array_merge(
-							$tax_query_defaults, array(
+							$tax_query_defaults,
+							array(
 								'terms' => array( $term ),
 							)
 						);
 					}
 				} else {
 					$tax_query[] = array_merge(
-						$tax_query_defaults, array(
+						$tax_query_defaults,
+						array(
 							'terms' => preg_split( '/[,]+/', $term ),
 						)
 					);
@@ -1428,7 +1430,8 @@ class WP_Query {
 		 * words into your language. Instead, look for and provide commonly accepted stopwords in your language.
 		 */
 		$words = explode(
-			',', _x(
+			',',
+			_x(
 				'about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www',
 				'Comma-separated list of search stopwords in your language'
 			)
@@ -1742,7 +1745,8 @@ class WP_Query {
 
 		if ( isset( $q['caller_get_posts'] ) ) {
 			_deprecated_argument(
-				'WP_Query', '3.1.0',
+				'WP_Query',
+				'3.1.0',
 				/* translators: 1: caller_get_posts, 2: ignore_sticky_posts */
 				sprintf(
 					__( '%1$s is deprecated. Use %2$s instead.' ),
@@ -2201,7 +2205,8 @@ class WP_Query {
 				$q['comment_count'] = array_merge(
 					array(
 						'compare' => '=',
-					), $q['comment_count']
+					),
+					$q['comment_count']
 				);
 
 				// Fallback for invalid compare operators is '='.
diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php
index 337a811c03..4963a01b6e 100644
--- a/wp-includes/class-wp-rewrite.php
+++ b/wp-includes/class-wp-rewrite.php
@@ -1183,7 +1183,8 @@ class WP_Rewrite {
 					if ( ! $page ) {
 						// Require <permalink>/attachment/stuff form for pages because of confusion with subpages.
 						$rewrite = array_merge(
-							$rewrite, array(
+							$rewrite,
+							array(
 								$sub1        => $subquery,
 								$sub1tb      => $subtbquery,
 								$sub1feed    => $subfeedquery,
@@ -1202,7 +1203,8 @@ class WP_Rewrite {
 							$sub2feed2   => $subfeedquery,
 							$sub2comment => $subcommentquery,
 							$sub2embed   => $subembedquery,
-						), $rewrite
+						),
+						$rewrite
 					);
 				}
 			}
diff --git a/wp-includes/class-wp-tax-query.php b/wp-includes/class-wp-tax-query.php
index 4b58635b4d..03e904c670 100644
--- a/wp-includes/class-wp-tax-query.php
+++ b/wp-includes/class-wp-tax-query.php
@@ -470,7 +470,8 @@ class WP_Tax_Query {
 				ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
 				WHERE $wpdb->term_taxonomy.taxonomy = %s
 				AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
-			)", $clause['taxonomy']
+			)",
+				$clause['taxonomy']
 			);
 
 		}
diff --git a/wp-includes/class-wp-taxonomy.php b/wp-includes/class-wp-taxonomy.php
index dfca25dd79..92ad89b557 100644
--- a/wp-includes/class-wp-taxonomy.php
+++ b/wp-includes/class-wp-taxonomy.php
@@ -296,7 +296,8 @@ final class WP_Taxonomy {
 
 		if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
 			$args['rewrite'] = wp_parse_args(
-				$args['rewrite'], array(
+				$args['rewrite'],
+				array(
 					'with_front'   => true,
 					'hierarchical' => false,
 					'ep_mask'      => EP_NONE,
diff --git a/wp-includes/class-wp-term-query.php b/wp-includes/class-wp-term-query.php
index 3fec7e26ff..4b949c6e16 100644
--- a/wp-includes/class-wp-term-query.php
+++ b/wp-includes/class-wp-term-query.php
@@ -428,7 +428,8 @@ class WP_Term_Query {
 				$excluded_children = array_merge(
 					$excluded_children,
 					(array) get_terms(
-						reset( $taxonomies ), array(
+						reset( $taxonomies ),
+						array(
 							'child_of'   => intval( $extrunk ),
 							'fields'     => 'ids',
 							'hide_empty' => 0,
diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php
index 7b933f9df5..ea5cb4e00e 100644
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -231,7 +231,8 @@ final class WP_Theme implements ArrayAccess {
 			}
 			$this->template = $this->stylesheet;
 			$this->cache_add(
-				'theme', array(
+				'theme',
+				array(
 					'headers'    => $this->headers,
 					'errors'     => $this->errors,
 					'stylesheet' => $this->stylesheet,
@@ -247,7 +248,8 @@ final class WP_Theme implements ArrayAccess {
 			$this->errors          = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
 			$this->template        = $this->stylesheet;
 			$this->cache_add(
-				'theme', array(
+				'theme',
+				array(
 					'headers'    => $this->headers,
 					'errors'     => $this->errors,
 					'stylesheet' => $this->stylesheet,
@@ -270,7 +272,8 @@ final class WP_Theme implements ArrayAccess {
 			/* translators: %s: Template */
 			$this->errors = new WP_Error( 'theme_child_invalid', sprintf( __( 'The theme defines itself as its parent theme. Please check the %s header.' ), '<code>Template</code>' ) );
 			$this->cache_add(
-				'theme', array(
+				'theme',
+				array(
 					'headers'    => $this->headers,
 					'errors'     => $this->errors,
 					'stylesheet' => $this->stylesheet,
@@ -293,7 +296,8 @@ final class WP_Theme implements ArrayAccess {
 				);
 				$this->errors = new WP_Error( 'theme_no_index', $error_message );
 				$this->cache_add(
-					'theme', array(
+					'theme',
+					array(
 						'headers'    => $this->headers,
 						'errors'     => $this->errors,
 						'stylesheet' => $this->stylesheet,
@@ -319,7 +323,8 @@ final class WP_Theme implements ArrayAccess {
 				// Parent theme is missing.
 				$this->errors = new WP_Error( 'theme_no_parent', sprintf( __( 'The parent theme is missing. Please install the "%s" parent theme.' ), esc_html( $this->template ) ) );
 				$this->cache_add(
-					'theme', array(
+					'theme',
+					array(
 						'headers'    => $this->headers,
 						'errors'     => $this->errors,
 						'stylesheet' => $this->stylesheet,
@@ -338,7 +343,8 @@ final class WP_Theme implements ArrayAccess {
 				$_child->parent = null;
 				$_child->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $_child->template ) ) );
 				$_child->cache_add(
-					'theme', array(
+					'theme',
+					array(
 						'headers'    => $_child->headers,
 						'errors'     => $_child->errors,
 						'stylesheet' => $_child->stylesheet,
@@ -349,7 +355,8 @@ final class WP_Theme implements ArrayAccess {
 				if ( $_child->stylesheet == $this->template ) {
 					$this->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $this->template ) ) );
 					$this->cache_add(
-						'theme', array(
+						'theme',
+						array(
 							'headers'    => $this->headers,
 							'errors'     => $this->errors,
 							'stylesheet' => $this->stylesheet,
diff --git a/wp-includes/class-wp-user.php b/wp-includes/class-wp-user.php
index 46aa0beb8f..4d0a28c5cf 100644
--- a/wp-includes/class-wp-user.php
+++ b/wp-includes/class-wp-user.php
@@ -239,7 +239,8 @@ class WP_User {
 
 		if ( ! $user = $wpdb->get_row(
 			$wpdb->prepare(
-				"SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
+				"SELECT * FROM $wpdb->users WHERE $db_field = %s",
+				$value
 			)
 		) ) {
 			return false;
@@ -261,7 +262,8 @@ class WP_User {
 	public function __isset( $key ) {
 		if ( 'id' == $key ) {
 			_deprecated_argument(
-				'WP_User->id', '2.1.0',
+				'WP_User->id',
+				'2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
 					__( 'Use %s instead.' ),
@@ -293,7 +295,8 @@ class WP_User {
 	public function __get( $key ) {
 		if ( 'id' == $key ) {
 			_deprecated_argument(
-				'WP_User->id', '2.1.0',
+				'WP_User->id',
+				'2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
 					__( 'Use %s instead.' ),
@@ -333,7 +336,8 @@ class WP_User {
 	public function __set( $key, $value ) {
 		if ( 'id' == $key ) {
 			_deprecated_argument(
-				'WP_User->id', '2.1.0',
+				'WP_User->id',
+				'2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
 					__( 'Use %s instead.' ),
@@ -357,7 +361,8 @@ class WP_User {
 	public function __unset( $key ) {
 		if ( 'id' == $key ) {
 			_deprecated_argument(
-				'WP_User->id', '2.1.0',
+				'WP_User->id',
+				'2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
 					__( 'Use %s instead.' ),
diff --git a/wp-includes/class-wp-widget.php b/wp-includes/class-wp-widget.php
index cd100c2d83..b9bb90e002 100644
--- a/wp-includes/class-wp-widget.php
+++ b/wp-includes/class-wp-widget.php
@@ -164,7 +164,8 @@ class WP_Widget {
 		$this->name            = $name;
 		$this->option_name     = 'widget_' . $this->id_base;
 		$this->widget_options  = wp_parse_args(
-			$widget_options, array(
+			$widget_options,
+			array(
 				'classname'                   => $this->option_name,
 				'customize_selective_refresh' => false,
 			)
diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index 948564abce..5c8ee133c6 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -1555,7 +1555,8 @@ class wp_xmlrpc_server extends IXR_Server {
 					$ambiguous_terms = array();
 					if ( is_taxonomy_hierarchical( $taxonomy ) ) {
 						$tax_term_names = get_terms(
-							$taxonomy, array(
+							$taxonomy,
+							array(
 								'fields'     => 'names',
 								'hide_empty' => false,
 							)
@@ -6839,8 +6840,14 @@ class wp_xmlrpc_server extends IXR_Server {
 		$comment_type = 'pingback';
 
 		$commentdata = compact(
-			'comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email',
-			'comment_content', 'comment_type', 'remote_source', 'remote_source_original'
+			'comment_post_ID',
+			'comment_author',
+			'comment_author_url',
+			'comment_author_email',
+			'comment_content',
+			'comment_type',
+			'remote_source',
+			'remote_source_original'
 		);
 
 		$comment_ID = wp_new_comment( $commentdata );
diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 1f7596dc55..d0bdba5024 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1152,7 +1152,8 @@ function get_trackback_url() {
 function trackback_url( $deprecated_echo = true ) {
 	if ( true !== $deprecated_echo ) {
 		_deprecated_argument(
-			__FUNCTION__, '2.5.0',
+			__FUNCTION__,
+			'2.5.0',
 			/* translators: %s: get_trackback_url() */
 			sprintf(
 				__( 'Use %s instead if you do not want the value echoed.' ),
@@ -1676,23 +1677,23 @@ function get_comment_reply_link( $args = array(), $comment = null, $post = null
 		);
 	} else {
 		$data_attributes = array(
-			'commentid'        => $comment->comment_ID,
-			'postid'           => $post->ID,
-			'belowelement'     => $args['add_below'] . '-' . $comment->comment_ID,
-			'respondelement'   => $args['respond_id'],
+			'commentid'      => $comment->comment_ID,
+			'postid'         => $post->ID,
+			'belowelement'   => $args['add_below'] . '-' . $comment->comment_ID,
+			'respondelement' => $args['respond_id'],
 		);
 
 		$data_attribute_string = '';
 
 		foreach ( $data_attributes as $name => $value ) {
-			$data_attribute_string .= " data-${name}=\"" . esc_attr( $value ) . "\"";
+			$data_attribute_string .= " data-${name}=\"" . esc_attr( $value ) . '"';
 		}
 
 		$data_attribute_string = trim( $data_attribute_string );
 
 		$link = sprintf(
 			"<a rel='nofollow' class='comment-reply-link' href='%s' %s aria-label='%s'>%s</a>",
-			esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $args['respond_id'],
+			esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . '#' . $args['respond_id'],
 			$data_attribute_string,
 			esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
 			$args['reply_text']
@@ -1779,7 +1780,9 @@ function get_post_reply_link( $args = array(), $post = null ) {
 	} else {
 		$onclick = sprintf(
 			'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
-			$args['add_below'], $post->ID, $args['respond_id']
+			$args['add_below'],
+			$post->ID,
+			$args['respond_id']
 		);
 
 		$link = sprintf(
@@ -2263,11 +2266,11 @@ function comment_form( $args = array(), $post_id = null ) {
 	$html_req = ( $req ? " required='required'" : '' );
 	$html5    = 'html5' === $args['format'];
 	$fields   = array(
-		'author'  => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
+		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
 					 '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $html_req . ' /></p>',
-		'email'   => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
+		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
 					 '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $html_req . ' /></p>',
-		'url'     => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
+		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
 					 '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
 	);
 
@@ -2376,7 +2379,7 @@ function comment_form( $args = array(), $post_id = null ) {
 			 */
 			do_action( 'comment_form_must_log_in_after' );
 		else :
-		?>
+			?>
 			<form action="<?php echo esc_url( $args['action'] ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
 				<?php
 				/**
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 0d1bc4843c..bc72b6e36b 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -381,7 +381,8 @@ function get_comment_count( $post_id = 0 ) {
 		FROM {$wpdb->comments}
 		{$where}
 		GROUP BY comment_approved
-	", ARRAY_A
+	",
+		ARRAY_A
 	);
 
 	$comment_count = array(
@@ -2520,7 +2521,8 @@ function discover_pingback_server_uri( $url, $deprecated = '' ) {
 	}
 
 	$response = wp_safe_remote_head(
-		$url, array(
+		$url,
+		array(
 			'timeout'     => 2,
 			'httpversion' => '1.0',
 		)
@@ -2541,7 +2543,8 @@ function discover_pingback_server_uri( $url, $deprecated = '' ) {
 
 	// Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
 	$response = wp_safe_remote_get(
-		$url, array(
+		$url,
+		array(
 			'timeout'     => 2,
 			'httpversion' => '1.0',
 		)
@@ -2656,7 +2659,9 @@ function do_trackbacks( $post_id ) {
 				$wpdb->query(
 					$wpdb->prepare(
 						"UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s,
-					'')) WHERE ID = %d", $tb_ping, $post->ID
+					'')) WHERE ID = %d",
+						$tb_ping,
+						$post->ID
 					)
 				);
 			}
diff --git a/wp-includes/cron.php b/wp-includes/cron.php
index 9434822bf4..8ecb43347f 100644
--- a/wp-includes/cron.php
+++ b/wp-includes/cron.php
@@ -692,7 +692,8 @@ function spawn_cron( $gmt_time = 0 ) {
 	 * @param string $doing_wp_cron The unix timestamp of the cron lock.
 	 */
 	$cron_request = apply_filters(
-		'cron_request', array(
+		'cron_request',
+		array(
 			'url'  => add_query_arg( 'doing_wp_cron', $doing_wp_cron, site_url( 'wp-cron.php' ) ),
 			'key'  => $doing_wp_cron,
 			'args' => array(
@@ -701,7 +702,8 @@ function spawn_cron( $gmt_time = 0 ) {
 				/** This filter is documented in wp-includes/class-wp-http-streams.php */
 				'sslverify' => apply_filters( 'https_local_ssl_verify', false ),
 			),
-		), $doing_wp_cron
+		),
+		$doing_wp_cron
 	);
 
 	$result = wp_remote_post( $cron_request['url'], $cron_request['args'] );
diff --git a/wp-includes/customize/class-wp-customize-background-image-control.php b/wp-includes/customize/class-wp-customize-background-image-control.php
index 38c04f5315..b31a811f5f 100644
--- a/wp-includes/customize/class-wp-customize-background-image-control.php
+++ b/wp-includes/customize/class-wp-customize-background-image-control.php
@@ -27,7 +27,9 @@ class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
 	 */
 	public function __construct( $manager ) {
 		parent::__construct(
-			$manager, 'background_image', array(
+			$manager,
+			'background_image',
+			array(
 				'label'   => __( 'Background Image' ),
 				'section' => 'background_image',
 			)
@@ -44,7 +46,9 @@ class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
 
 		$custom_background = get_theme_support( 'custom-background' );
 		wp_localize_script(
-			'customize-controls', '_wpCustomizeBackground', array(
+			'customize-controls',
+			'_wpCustomizeBackground',
+			array(
 				'defaults' => ! empty( $custom_background[0] ) ? $custom_background[0] : array(),
 				'nonces'   => array(
 					'add' => wp_create_nonce( 'background-add' ),
diff --git a/wp-includes/customize/class-wp-customize-custom-css-setting.php b/wp-includes/customize/class-wp-customize-custom-css-setting.php
index 967f459357..085a8b5583 100644
--- a/wp-includes/customize/class-wp-customize-custom-css-setting.php
+++ b/wp-includes/customize/class-wp-customize-custom-css-setting.php
@@ -181,7 +181,8 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 		}
 
 		$r = wp_update_custom_css_post(
-			$css, array(
+			$css,
+			array(
 				'stylesheet' => $this->stylesheet,
 			)
 		);
diff --git a/wp-includes/customize/class-wp-customize-header-image-control.php b/wp-includes/customize/class-wp-customize-header-image-control.php
index 68262dd62c..f8ca8fe21f 100644
--- a/wp-includes/customize/class-wp-customize-header-image-control.php
+++ b/wp-includes/customize/class-wp-customize-header-image-control.php
@@ -28,7 +28,9 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 	 */
 	public function __construct( $manager ) {
 		parent::__construct(
-			$manager, 'header_image', array(
+			$manager,
+			'header_image',
+			array(
 				'label'    => __( 'Header Image' ),
 				'settings' => array(
 					'default' => 'header_image',
@@ -51,7 +53,9 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 		$this->prepare_control();
 
 		wp_localize_script(
-			'customize-views', '_wpCustomizeHeader', array(
+			'customize-views',
+			'_wpCustomizeHeader',
+			array(
 				'data'     => array(
 					'width'         => absint( get_theme_support( 'custom-header', 'width' ) ),
 					'height'        => absint( get_theme_support( 'custom-header', 'height' ) ),
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php b/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
index b5ce2e3cf4..c36f19525c 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
@@ -353,7 +353,9 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 
 		if ( ! isset( $this->value['nav_menu_term_id'] ) && $this->post_id > 0 ) {
 			$menus = wp_get_post_terms(
-				$this->post_id, WP_Customize_Nav_Menu_Setting::TAXONOMY, array(
+				$this->post_id,
+				WP_Customize_Nav_Menu_Setting::TAXONOMY,
+				array(
 					'fields' => 'ids',
 				)
 			);
@@ -557,7 +559,8 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 
 		if ( ARRAY_A === $args['output'] ) {
 			$items = wp_list_sort(
-				$items, array(
+				$items,
+				array(
 					$args['output_key'] => 'ASC',
 				)
 			);
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-setting.php b/wp-includes/customize/class-wp-customize-nav-menu-setting.php
index 6744f92bef..a2ac3851fa 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-setting.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-setting.php
@@ -269,7 +269,8 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 					'term_group'       => 0,
 					'taxonomy'         => self::TAXONOMY,
 					'filter'           => 'raw',
-				), $setting_value
+				),
+				$setting_value
 			);
 
 			array_splice( $menus, $index, ( -1 === $index ? 0 : 1 ), array( $menu_obj ) );
@@ -278,7 +279,8 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 		// Make sure the menu objects get re-sorted after an update/insert.
 		if ( ! $is_delete && ! empty( $args['orderby'] ) ) {
 			$menus = wp_list_sort(
-				$menus, array(
+				$menus,
+				array(
 					$args['orderby'] => 'ASC',
 				)
 			);
@@ -366,7 +368,8 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 				'term_group'       => 0,
 				'taxonomy'         => self::TAXONOMY,
 				'filter'           => 'raw',
-			), $setting_value
+			),
+			$setting_value
 		);
 
 		return $menu_obj;
diff --git a/wp-includes/customize/class-wp-customize-nav-menus-panel.php b/wp-includes/customize/class-wp-customize-nav-menus-panel.php
index 5b85f47804..f7f15c000a 100644
--- a/wp-includes/customize/class-wp-customize-nav-menus-panel.php
+++ b/wp-includes/customize/class-wp-customize-nav-menus-panel.php
@@ -96,6 +96,6 @@ class WP_Customize_Nav_Menus_Panel extends WP_Customize_Panel {
 		// NOTE: The following is a workaround for an inability to treat (and thus label) a list of sections as a whole.
 		?>
 		<li class="customize-control-title customize-section-title-nav_menus-heading"><?php _e( 'Menus' ); ?></li>
-	<?php
+		<?php
 	}
 }
diff --git a/wp-includes/customize/class-wp-customize-theme-control.php b/wp-includes/customize/class-wp-customize-theme-control.php
index 6b86ce84de..c66ba28612 100644
--- a/wp-includes/customize/class-wp-customize-theme-control.php
+++ b/wp-includes/customize/class-wp-customize-theme-control.php
@@ -130,6 +130,6 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
 				</div>
 			<# } #>
 		</div>
-	<?php
+		<?php
 	}
 }
diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 5487c8fbe4..3f29f947f0 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -380,7 +380,7 @@ add_action( 'post_updated', 'wp_check_for_changed_slugs', 12, 3 );
 add_action( 'attachment_updated', 'wp_check_for_changed_slugs', 12, 3 );
 
 // Redirect Old Dates
-add_action( 'post_updated',       'wp_check_for_changed_dates', 12, 3 );
+add_action( 'post_updated', 'wp_check_for_changed_dates', 12, 3 );
 add_action( 'attachment_updated', 'wp_check_for_changed_dates', 12, 3 );
 
 // Nonce check for Post Previews
diff --git a/wp-includes/embed.php b/wp-includes/embed.php
index 140c729a3b..8a272ef3d2 100644
--- a/wp-includes/embed.php
+++ b/wp-includes/embed.php
@@ -401,7 +401,8 @@ function get_oembed_endpoint_url( $permalink = '', $format = 'json' ) {
 			array(
 				'url'    => urlencode( $permalink ),
 				'format' => ( 'json' !== $format ) ? $format : false,
-			), $url
+			),
+			$url
 		);
 	}
 
@@ -522,7 +523,8 @@ function get_oembed_response_data( $post, $width ) {
 	 * }
 	 */
 	$min_max_width = apply_filters(
-		'oembed_min_max_width', array(
+		'oembed_min_max_width',
+		array(
 			'min' => 200,
 			'max' => 600,
 		)
@@ -1082,7 +1084,8 @@ function wp_filter_pre_oembed_result( $result, $url, $args ) {
 
 	if ( is_multisite() ) {
 		$url_parts = wp_parse_args(
-			wp_parse_url( $url ), array(
+			wp_parse_url( $url ),
+			array(
 				'host' => '',
 				'path' => '/',
 			)
diff --git a/wp-includes/feed-atom-comments.php b/wp-includes/feed-atom-comments.php
index dd0de67d69..01a475ff94 100644
--- a/wp-includes/feed-atom-comments.php
+++ b/wp-includes/feed-atom-comments.php
@@ -76,7 +76,7 @@ if ( have_comments() ) :
 	while ( have_comments() ) :
 		the_comment();
 		$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
-	?>
+		?>
 	<entry>
 		<title>
 		<?php
@@ -90,7 +90,7 @@ if ( have_comments() ) :
 			/* translators: Comment author title. %s: Comment author name */
 			printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );
 		}
-			?>
+		?>
 			</title>
 			<link rel="alternate" href="<?php comment_link(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
 
@@ -99,14 +99,14 @@ if ( have_comments() ) :
 			<?php
 			if ( get_comment_author_url() ) {
 				echo '<uri>' . get_comment_author_url() . '</uri>';}
-?>
+			?>
 
 		</author>
 
 		<id><?php comment_guid(); ?></id>
 		<updated><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', get_comment_time( 'Y-m-d H:i:s', true, false ), false ); ?></updated>
 		<published><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', get_comment_time( 'Y-m-d H:i:s', true, false ), false ); ?></published>
-	<?php if ( post_password_required( $comment_post ) ) : ?>
+		<?php if ( post_password_required( $comment_post ) ) : ?>
 		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
 	<?php else : // post pass ?>
 		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
@@ -120,9 +120,9 @@ if ( $comment->comment_parent == 0 ) : // This comment is top level
 	else : // This comment is in reply to another comment
 		$parent_comment = get_comment( $comment->comment_parent );
 		// The rel attribute below and the id tag above should be GUIDs, but WP doesn't create them for comments (unlike posts). Either way, it's more important that they both use the same system
-	?>
+		?>
 		<thr:in-reply-to ref="<?php comment_guid( $parent_comment ); ?>" href="<?php echo get_comment_link( $parent_comment ); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
-<?php
+		<?php
 endif;
 	/**
 	 * Fires at the end of each Atom comment feed item.
@@ -135,7 +135,7 @@ endif;
 	do_action( 'comment_atom_entry', $comment->comment_ID, $comment_post->ID );
 	?>
 	</entry>
-	<?php
+		<?php
 	endwhile;
 endif;
 ?>
diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index dbc2ccf90a..b7cd5d941e 100644
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -51,13 +51,13 @@ do_action( 'rss_tag_pre', 'atom' );
 
 	while ( have_posts() ) :
 		the_post();
-	?>
+		?>
 	<entry>
 		<author>
 			<name><?php the_author(); ?></name>
 			<?php $author_url = get_the_author_meta( 'url' ); if ( ! empty( $author_url ) ) : ?>
 			<uri><?php the_author_meta( 'url' ); ?></uri>
-			<?php
+				<?php
 			endif;
 
 			/**
@@ -66,7 +66,7 @@ do_action( 'rss_tag_pre', 'atom' );
 			 * @since 3.2.0
 			 */
 			do_action( 'atom_author' );
-		?>
+?>
 		</author>
 		<title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss(); ?>]]></title>
 		<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php the_permalink_rss(); ?>" />
@@ -75,24 +75,24 @@ do_action( 'rss_tag_pre', 'atom' );
 		<published><?php echo get_post_time( 'Y-m-d\TH:i:s\Z', true ); ?></published>
 		<?php the_category_rss( 'atom' ); ?>
 		<summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-<?php if ( ! get_option( 'rss_use_excerpt' ) ) : ?>
+		<?php if ( ! get_option( 'rss_use_excerpt' ) ) : ?>
 		<content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss(); ?>"><![CDATA[<?php the_content_feed( 'atom' ); ?>]]></content>
-<?php endif; ?>
-	<?php
-	atom_enclosure();
-	/**
-	 * Fires at the end of each Atom feed item.
-	 *
-	 * @since 2.0.0
-	 */
-	do_action( 'atom_entry' );
+		<?php endif; ?>
+		<?php
+		atom_enclosure();
+		/**
+		 * Fires at the end of each Atom feed item.
+		 *
+		 * @since 2.0.0
+		 */
+		do_action( 'atom_entry' );
 
-	if ( get_comments_number() || comments_open() ) :
-		?>
+		if ( get_comments_number() || comments_open() ) :
+			?>
 		<link rel="replies" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php the_permalink_rss(); ?>#comments" thr:count="<?php echo get_comments_number(); ?>"/>
 		<link rel="replies" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link( 0, 'atom' ) ); ?>" thr:count="<?php echo get_comments_number(); ?>"/>
 		<thr:total><?php echo get_comments_number(); ?></thr:total>
-	<?php endif; ?>
+		<?php endif; ?>
 	</entry>
 	<?php endwhile; ?>
 </feed>
diff --git a/wp-includes/feed-rdf.php b/wp-includes/feed-rdf.php
index fe6e4cb741..4fa4147431 100644
--- a/wp-includes/feed-rdf.php
+++ b/wp-includes/feed-rdf.php
@@ -65,7 +65,7 @@ do_action( 'rss_tag_pre', 'rdf' );
 		<?php
 		while ( have_posts() ) :
 			the_post();
-?>
+			?>
 			<rdf:li rdf:resource="<?php the_permalink_rss(); ?>"/>
 		<?php endwhile; ?>
 		</rdf:Seq>
@@ -75,14 +75,14 @@ do_action( 'rss_tag_pre', 'rdf' );
 rewind_posts();
 while ( have_posts() ) :
 	the_post();
-?>
+	?>
 <item rdf:about="<?php the_permalink_rss(); ?>">
 	<title><?php the_title_rss(); ?></title>
 	<link><?php the_permalink_rss(); ?></link>
 	<dc:date><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', $post->post_date_gmt, false ); ?></dc:date>
 	<dc:creator><![CDATA[<?php the_author(); ?>]]></dc:creator>
 	<?php the_category_rss( 'rdf' ); ?>
-<?php if ( get_option( 'rss_use_excerpt' ) ) : ?>
+	<?php if ( get_option( 'rss_use_excerpt' ) ) : ?>
 	<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
 <?php else : ?>
 	<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php
index 15e049fc07..c776c77b56 100644
--- a/wp-includes/feed-rss.php
+++ b/wp-includes/feed-rss.php
@@ -35,7 +35,7 @@ echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>
 <?php
 while ( have_posts() ) :
 	the_post();
-?>
+	?>
 	<item>
 		<title><?php the_title_rss(); ?></title>
 		<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php
index 6c9192c125..c0d51dc9cd 100644
--- a/wp-includes/feed-rss2-comments.php
+++ b/wp-includes/feed-rss2-comments.php
@@ -99,7 +99,7 @@ do_action( 'rss_tag_pre', 'rss2-comments' );
 		<dc:creator><![CDATA[<?php echo get_comment_author_rss(); ?>]]></dc:creator>
 		<pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_comment_time( 'Y-m-d H:i:s', true, false ), false ); ?></pubDate>
 		<guid isPermaLink="false"><?php comment_guid(); ?></guid>
-		<?php if ( post_password_required( $comment_post ) ) : ?>
+			<?php if ( post_password_required( $comment_post ) ) : ?>
 		<description><?php echo ent2ncr( __( 'Protected Comments: Please enter your password to view comments.' ) ); ?></description>
 		<content:encoded><![CDATA[<?php echo get_the_password_form(); ?>]]></content:encoded>
 		<?php else : // post pass ?>
@@ -116,11 +116,11 @@ do_action( 'rss_tag_pre', 'rss2-comments' );
 			 * @param int $comment_post->ID    The ID of the post the comment is connected to.
 			 */
 			do_action( 'commentrss2_item', $comment->comment_ID, $comment_post->ID );
-		?>
+?>
 			</item>
-		<?php
+			<?php
 		endwhile;
 endif;
-?>
+	?>
 </channel>
 </rss>
diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php
index fede1c4b5e..6a99165ac7 100644
--- a/wp-includes/feed-rss2.php
+++ b/wp-includes/feed-rss2.php
@@ -89,42 +89,42 @@ do_action( 'rss_tag_pre', 'rss2' );
 
 	while ( have_posts() ) :
 		the_post();
-	?>
+		?>
 	<item>
 		<title><?php the_title_rss(); ?></title>
 		<link><?php the_permalink_rss(); ?></link>
-<?php if ( get_comments_number() || comments_open() ) : ?>
+		<?php if ( get_comments_number() || comments_open() ) : ?>
 		<comments><?php comments_link_feed(); ?></comments>
-<?php endif; ?>
+		<?php endif; ?>
 		<pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>
 		<dc:creator><![CDATA[<?php the_author(); ?>]]></dc:creator>
 		<?php the_category_rss( 'rss2' ); ?>
 
 		<guid isPermaLink="false"><?php the_guid(); ?></guid>
-<?php if ( get_option( 'rss_use_excerpt' ) ) : ?>
+		<?php if ( get_option( 'rss_use_excerpt' ) ) : ?>
 		<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
-<?php else : ?>
+		<?php else : ?>
 		<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
-	<?php $content = get_the_content_feed( 'rss2' ); ?>
-	<?php if ( strlen( $content ) > 0 ) : ?>
+			<?php $content = get_the_content_feed( 'rss2' ); ?>
+			<?php if ( strlen( $content ) > 0 ) : ?>
 		<content:encoded><![CDATA[<?php echo $content; ?>]]></content:encoded>
 	<?php else : ?>
 		<content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>
 	<?php endif; ?>
-<?php endif; ?>
-<?php if ( get_comments_number() || comments_open() ) : ?>
+		<?php endif; ?>
+		<?php if ( get_comments_number() || comments_open() ) : ?>
 		<wfw:commentRss><?php echo esc_url( get_post_comments_feed_link( null, 'rss2' ) ); ?></wfw:commentRss>
 		<slash:comments><?php echo get_comments_number(); ?></slash:comments>
-<?php endif; ?>
-<?php rss_enclosure(); ?>
-	<?php
-	/**
-	 * Fires at the end of each RSS2 feed item.
-	 *
-	 * @since 2.0.0
-	 */
-	do_action( 'rss2_item' );
-	?>
+		<?php endif; ?>
+		<?php rss_enclosure(); ?>
+		<?php
+		/**
+		 * Fires at the end of each RSS2 feed item.
+		 *
+		 * @since 2.0.0
+		 */
+		do_action( 'rss2_item' );
+		?>
 	</item>
 	<?php endwhile; ?>
 </channel>
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 58165b48d5..8fb6eb01c6 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -130,14 +130,16 @@ function wptexturize( $text, $reset = false ) {
 			 * lines of code 'til we have enough of 'em, then we need to insert apostrophes instead of quotes.
 			 */
 			$cockney = explode(
-				',', _x(
+				',',
+				_x(
 					"'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
 					'Comma-separated list of words to texturize in your language'
 				)
 			);
 
 			$cockneyreplace = explode(
-				',', _x(
+				',',
+				_x(
 					'&#8217;tain&#8217;t,&#8217;twere,&#8217;twas,&#8217;tis,&#8217;twill,&#8217;til,&#8217;bout,&#8217;nuff,&#8217;round,&#8217;cause,&#8217;em',
 					'Comma-separated list of replacement words in your language'
 				)
@@ -2262,7 +2264,9 @@ function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'displa
 				'%cc%80',
 				'%cc%84',
 				'%cc%8c',
-			), '', $title
+			),
+			'',
+			$title
 		);
 
 		// Convert times to x
@@ -3072,12 +3076,12 @@ function wp_targeted_link_rel_callback( $matches ) {
 	}
 
 	if ( ! empty( $rel_match[0] ) ) {
-		$parts = preg_split( '|\s+|', strtolower( $rel_match[2] ) );
-		$parts = array_map( 'esc_attr', $parts );
-		$needed = explode( ' ', $rel );
-		$parts = array_unique( array_merge( $parts, $needed ) );
+		$parts     = preg_split( '|\s+|', strtolower( $rel_match[2] ) );
+		$parts     = array_map( 'esc_attr', $parts );
+		$needed    = explode( ' ', $rel );
+		$parts     = array_unique( array_merge( $parts, $needed ) );
 		$delimiter = trim( $rel_match[1] ) ? $rel_match[1] : '"';
-		$rel = 'rel=' . $delimiter . trim( implode( ' ', $parts ) ) . $delimiter;
+		$rel       = 'rel=' . $delimiter . trim( implode( ' ', $parts ) ) . $delimiter;
 		$link_html = str_replace( $rel_match[0], $rel, $link_html );
 	} else {
 		$link_html .= " rel=\"$rel\"";
@@ -4843,7 +4847,8 @@ function wp_sprintf_l( $pattern, $args ) {
 	 * @param array $delimiters An array of translated delimiters.
 	 */
 	$l = apply_filters(
-		'wp_sprintf_l', array(
+		'wp_sprintf_l',
+		array(
 			/* translators: used to join items in a list with more than 2 items */
 			'between'          => sprintf( __( '%1$s, %2$s' ), '', '' ),
 			/* translators: used to join last two items in a list with more than 2 times */
@@ -5336,7 +5341,7 @@ function print_emoji_styles() {
 	}
 
 	$printed = true;
-?>
+	?>
 <style type="text/css">
 img.wp-smiley,
 img.emoji {
@@ -5351,7 +5356,7 @@ img.emoji {
 	padding: 0 !important;
 }
 </style>
-<?php
+	<?php
 }
 
 /**
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 2ed7a3d3f2..3efc93a450 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -107,8 +107,8 @@ function date_i18n( $dateformatstring, $timestamp_with_offset = false, $gmt = fa
 	 */
 	$req_format = $dateformatstring;
 
-	$dateformatstring = preg_replace( "/(?<!\\\\)c/", DATE_W3C, $dateformatstring );
-	$dateformatstring = preg_replace( "/(?<!\\\\)r/", DATE_RFC2822, $dateformatstring );
+	$dateformatstring = preg_replace( '/(?<!\\\\)c/', DATE_W3C, $dateformatstring );
+	$dateformatstring = preg_replace( '/(?<!\\\\)r/', DATE_RFC2822, $dateformatstring );
 
 	if ( ( ! empty( $wp_locale->month ) ) && ( ! empty( $wp_locale->weekday ) ) ) {
 		$datemonth            = $wp_locale->get_month( date( 'm', $i ) );
@@ -1821,7 +1821,7 @@ function wp_normalize_path( $path ) {
 	$wrapper = '';
 	if ( wp_is_stream( $path ) ) {
 		list( $wrapper, $path ) = explode( '://', $path, 2 );
-		$wrapper .= '://';
+		$wrapper               .= '://';
 	}
 
 	// Standardise all paths to use /
@@ -2292,7 +2292,8 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
 	 * @param mixed $upload_bits_error An array of upload bits data, or a non-array error to return.
 	 */
 	$upload_bits_error = apply_filters(
-		'wp_upload_bits', array(
+		'wp_upload_bits',
+		array(
 			'name' => $name,
 			'bits' => $bits,
 			'time' => $time,
@@ -2342,12 +2343,14 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
 
 	/** This filter is documented in wp-admin/includes/file.php */
 	return apply_filters(
-		'wp_handle_upload', array(
+		'wp_handle_upload',
+		array(
 			'file'  => $new_file,
 			'url'   => $url,
 			'type'  => $wp_filetype['type'],
 			'error' => false,
-		), 'sideload'
+		),
+		'sideload'
 	);
 }
 
@@ -2449,7 +2452,8 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
 			 * @param  array $mime_to_ext Array of image mime types and their matching extensions.
 			 */
 			$mime_to_ext = apply_filters(
-				'getimagesize_mimes_to_exts', array(
+				'getimagesize_mimes_to_exts',
+				array(
 					'image/jpeg' => 'jpg',
 					'image/png'  => 'png',
 					'image/gif'  => 'gif',
@@ -2568,7 +2572,8 @@ function wp_get_mime_types() {
 	 *                                 corresponding to those types.
 	 */
 	return apply_filters(
-		'mime_types', array(
+		'mime_types',
+		array(
 			// Image formats.
 			'jpg|jpeg|jpe'                 => 'image/jpeg',
 			'gif'                          => 'image/gif',
@@ -2694,7 +2699,8 @@ function wp_get_ext_types() {
 	 *                        of file types.
 	 */
 	return apply_filters(
-		'ext2type', array(
+		'ext2type',
+		array(
 			'image'       => array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ),
 			'audio'       => array( 'aac', 'ac3', 'aif', 'aiff', 'flac', 'm3a', 'm4a', 'm4b', 'mka', 'mp1', 'mp2', 'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
 			'video'       => array( '3g2', '3gp', '3gpp', 'asf', 'avi', 'divx', 'dv', 'flv', 'm4v', 'mkv', 'mov', 'mp4', 'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt', 'rm', 'vob', 'wmv' ),
@@ -2926,17 +2932,17 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 		} else {
 			$dir_attr = "dir='$text_direction'";
 		}
-?>
+		?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" <?php echo $dir_attr; ?>>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width">
-	<?php
-	if ( function_exists( 'wp_no_robots' ) ) {
-		wp_no_robots();
-	}
-	?>
+		<?php
+		if ( function_exists( 'wp_no_robots' ) ) {
+			wp_no_robots();
+		}
+		?>
 	<title><?php echo $title; ?></title>
 	<style type="text/css">
 		html {
@@ -3060,7 +3066,7 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 	<?php echo $message; ?>
 </body>
 </html>
-<?php
+	<?php
 	die();
 }
 
@@ -3346,7 +3352,9 @@ function wp_send_json( $response, $status_code = null ) {
 
 	if ( wp_doing_ajax() ) {
 		wp_die(
-			'', '', array(
+			'',
+			'',
+			array(
 				'response' => null,
 			)
 		);
@@ -3963,7 +3971,7 @@ function dead_db() {
 	if ( is_rtl() ) {
 		$dir_attr = ' dir="rtl"';
 	}
-?>
+	?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"<?php echo $dir_attr; ?>>
 <head>
@@ -3975,7 +3983,7 @@ function dead_db() {
 	<h1><?php _e( 'Error establishing a database connection' ); ?></h1>
 </body>
 </html>
-<?php
+	<?php
 	die();
 }
 
@@ -4098,7 +4106,10 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 				trigger_error(
 					sprintf(
 						__( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.' ),
-						$class, $parent_class, $version, '<pre>__construct()</pre>'
+						$class,
+						$parent_class,
+						$version,
+						'<pre>__construct()</pre>'
 					)
 				);
 			} else {
@@ -4106,7 +4117,9 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 				trigger_error(
 					sprintf(
 						__( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
-						$class, $version, '<pre>__construct()</pre>'
+						$class,
+						$version,
+						'<pre>__construct()</pre>'
 					)
 				);
 			}
@@ -4115,14 +4128,19 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 				trigger_error(
 					sprintf(
 						'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.',
-						$class, $parent_class, $version, '<pre>__construct()</pre>'
+						$class,
+						$parent_class,
+						$version,
+						'<pre>__construct()</pre>'
 					)
 				);
 			} else {
 				trigger_error(
 					sprintf(
 						'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
-						$class, $version, '<pre>__construct()</pre>'
+						$class,
+						$version,
+						'<pre>__construct()</pre>'
 					)
 				);
 			}
@@ -5467,7 +5485,7 @@ function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pr
 	if ( ! isset( $truncate_paths ) ) {
 		$truncate_paths = array(
 			wp_normalize_path( WP_CONTENT_DIR ),
-			wp_normalize_path( ABSPATH )
+			wp_normalize_path( ABSPATH ),
 		);
 	}
 
@@ -5666,7 +5684,8 @@ function wp_auth_check_html() {
 			array(
 				'interim-login' => '1',
 				'wp_lang'       => get_user_locale(),
-			), $login_url
+			),
+			$login_url
 		);
 		?>
 		<div id="wp-auth-check-form" class="loading" data-src="<?php echo esc_url( $login_src ); ?>"></div>
@@ -5865,7 +5884,7 @@ function wp_delete_file( $file ) {
  * @return bool True on success, false on failure.
  */
 function wp_delete_file_from_directory( $file, $directory ) {
-	$real_file = realpath( wp_normalize_path( $file ) );
+	$real_file      = realpath( wp_normalize_path( $file ) );
 	$real_directory = realpath( wp_normalize_path( $directory ) );
 
 	if ( false === $real_file || false === $real_directory || strpos( wp_normalize_path( $real_file ), trailingslashit( wp_normalize_path( $real_directory ) ) ) !== 0 ) {
@@ -6048,11 +6067,14 @@ function wp_raise_memory_limit( $context = 'admin' ) {
 function wp_generate_uuid4() {
 	return sprintf(
 		'%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
+		mt_rand( 0, 0xffff ),
+		mt_rand( 0, 0xffff ),
 		mt_rand( 0, 0xffff ),
 		mt_rand( 0, 0x0fff ) | 0x4000,
 		mt_rand( 0, 0x3fff ) | 0x8000,
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
+		mt_rand( 0, 0xffff ),
+		mt_rand( 0, 0xffff ),
+		mt_rand( 0, 0xffff )
 	);
 }
 
@@ -6190,10 +6212,13 @@ All at ###SITENAME###
 	$email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
 
 	wp_mail(
-		$email_change_email['to'], sprintf(
+		$email_change_email['to'],
+		sprintf(
 			$email_change_email['subject'],
 			$site_name
-		), $email_change_email['message'], $email_change_email['headers']
+		),
+		$email_change_email['message'],
+		$email_change_email['headers']
 	);
 }
 
@@ -6249,7 +6274,7 @@ function wp_privacy_anonymize_ip( $ip_addr, $ipv6_fallback = false ) {
 		// Partially anonymize the IP by reducing it to the corresponding network ID.
 		if ( function_exists( 'inet_pton' ) && function_exists( 'inet_ntop' ) ) {
 			$ip_addr = inet_ntop( inet_pton( $ip_addr ) & inet_pton( $netmask ) );
-			if ( false === $ip_addr) {
+			if ( false === $ip_addr ) {
 				return '::';
 			}
 		} elseif ( ! $ipv6_fallback ) {
diff --git a/wp-includes/functions.wp-scripts.php b/wp-includes/functions.wp-scripts.php
index 765fe92ad4..5d9062aeef 100644
--- a/wp-includes/functions.wp-scripts.php
+++ b/wp-includes/functions.wp-scripts.php
@@ -39,13 +39,15 @@ function _wp_scripts_maybe_doing_it_wrong( $function ) {
 	}
 
 	_doing_it_wrong(
-		$function, sprintf(
+		$function,
+		sprintf(
 			/* translators: 1: wp_enqueue_scripts, 2: admin_enqueue_scripts, 3: login_enqueue_scripts */
 			__( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
 			'<code>wp_enqueue_scripts</code>',
 			'<code>admin_enqueue_scripts</code>',
 			'<code>login_enqueue_scripts</code>'
-		), '3.3.0'
+		),
+		'3.3.0'
 	);
 }
 
@@ -111,12 +113,14 @@ function wp_add_inline_script( $handle, $data, $position = 'after' ) {
 
 	if ( false !== stripos( $data, '</script>' ) ) {
 		_doing_it_wrong(
-			__FUNCTION__, sprintf(
+			__FUNCTION__,
+			sprintf(
 				/* translators: 1: <script>, 2: wp_add_inline_script() */
 				__( 'Do not pass %1$s tags to %2$s.' ),
 				'<code>&lt;script&gt;</code>',
 				'<code>wp_add_inline_script()</code>'
-			), '4.5.0'
+			),
+			'4.5.0'
 		);
 		$data = trim( preg_replace( '#<script[^>]*>(.*)</script>#is', '$1', $data ) );
 	}
diff --git a/wp-includes/functions.wp-styles.php b/wp-includes/functions.wp-styles.php
index 3b7f20b26c..ec791747c3 100644
--- a/wp-includes/functions.wp-styles.php
+++ b/wp-includes/functions.wp-styles.php
@@ -85,12 +85,14 @@ function wp_add_inline_style( $handle, $data ) {
 
 	if ( false !== stripos( $data, '</style>' ) ) {
 		_doing_it_wrong(
-			__FUNCTION__, sprintf(
+			__FUNCTION__,
+			sprintf(
 				/* translators: 1: <style>, 2: wp_add_inline_style() */
 				__( 'Do not pass %1$s tags to %2$s.' ),
 				'<code>&lt;style&gt;</code>',
 				'<code>wp_add_inline_style()</code>'
-			), '3.7.0'
+			),
+			'3.7.0'
 		);
 		$data = trim( preg_replace( '#<style[^>]*>(.*)</style>#is', '$1', $data ) );
 	}
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index d521a64eab..81ba70d40b 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -645,7 +645,9 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
 		case 'home': // DEPRECATED
 		case 'siteurl': // DEPRECATED
 			_deprecated_argument(
-				__FUNCTION__, '2.2.0', sprintf(
+				__FUNCTION__,
+				'2.2.0',
+				sprintf(
 					/* translators: 1: 'siteurl'/'home' argument, 2: bloginfo() function name, 3: 'url' argument */
 					__( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead.' ),
 					'<code>' . $show . '</code>',
@@ -722,7 +724,9 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
 			break;
 		case 'text_direction':
 			_deprecated_argument(
-				__FUNCTION__, '2.2.0', sprintf(
+				__FUNCTION__,
+				'2.2.0',
+				sprintf(
 					/* translators: 1: 'text_direction' argument, 2: bloginfo() function name, 3: is_rtl() function name */
 					__( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead.' ),
 					'<code>' . $show . '</code>',
@@ -1886,7 +1890,8 @@ function wp_get_archives( $args = '' ) {
 						array(
 							'm' => $arc_year,
 							'w' => $result->week,
-						), home_url( '/' )
+						),
+						home_url( '/' )
 					);
 					if ( 'post' !== $r['post_type'] ) {
 						$url = add_query_arg( 'post_type', $r['post_type'], $url );
@@ -2106,7 +2111,8 @@ function get_calendar( $initial = true, $echo = true ) {
 		"SELECT DISTINCT DAYOFMONTH(post_date)
 		FROM $wpdb->posts WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'
 		AND post_type = 'post' AND post_status = 'publish'
-		AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", ARRAY_N
+		AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'",
+		ARRAY_N
 	);
 	if ( $dayswithposts ) {
 		foreach ( (array) $dayswithposts as $daywith ) {
@@ -3359,7 +3365,8 @@ function wp_enqueue_code_editor( $args ) {
 
 	if ( 'text/css' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'              => 'css',
 				'lint'              => true,
 				'autoCloseBrackets' => true,
@@ -3368,7 +3375,8 @@ function wp_enqueue_code_editor( $args ) {
 		);
 	} elseif ( 'text/x-scss' === $type || 'text/x-less' === $type || 'text/x-sass' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'              => $type,
 				'lint'              => false,
 				'autoCloseBrackets' => true,
@@ -3377,13 +3385,15 @@ function wp_enqueue_code_editor( $args ) {
 		);
 	} elseif ( 'text/x-diff' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode' => 'diff',
 			)
 		);
 	} elseif ( 'text/html' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'              => 'htmlmixed',
 				'lint'              => true,
 				'autoCloseBrackets' => true,
@@ -3399,14 +3409,16 @@ function wp_enqueue_code_editor( $args ) {
 		}
 	} elseif ( 'text/x-gfm' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'                => 'gfm',
 				'highlightFormatting' => true,
 			)
 		);
 	} elseif ( 'application/javascript' === $type || 'text/javascript' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'              => 'javascript',
 				'lint'              => true,
 				'autoCloseBrackets' => true,
@@ -3415,7 +3427,8 @@ function wp_enqueue_code_editor( $args ) {
 		);
 	} elseif ( false !== strpos( $type, 'json' ) ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'              => array(
 					'name' => 'javascript',
 				),
@@ -3431,7 +3444,8 @@ function wp_enqueue_code_editor( $args ) {
 		}
 	} elseif ( false !== strpos( $type, 'jsx' ) ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'              => 'jsx',
 				'autoCloseBrackets' => true,
 				'matchBrackets'     => true,
@@ -3439,20 +3453,23 @@ function wp_enqueue_code_editor( $args ) {
 		);
 	} elseif ( 'text/x-markdown' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'                => 'markdown',
 				'highlightFormatting' => true,
 			)
 		);
 	} elseif ( 'text/nginx' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode' => 'nginx',
 			)
 		);
 	} elseif ( 'application/x-httpd-php' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'              => 'php',
 				'autoCloseBrackets' => true,
 				'autoCloseTags'     => true,
@@ -3464,7 +3481,8 @@ function wp_enqueue_code_editor( $args ) {
 		);
 	} elseif ( 'text/x-sql' === $type || 'text/x-mysql' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'              => 'sql',
 				'autoCloseBrackets' => true,
 				'matchBrackets'     => true,
@@ -3472,7 +3490,8 @@ function wp_enqueue_code_editor( $args ) {
 		);
 	} elseif ( false !== strpos( $type, 'xml' ) ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode'              => 'xml',
 				'autoCloseBrackets' => true,
 				'autoCloseTags'     => true,
@@ -3483,7 +3502,8 @@ function wp_enqueue_code_editor( $args ) {
 		);
 	} elseif ( 'text/x-yaml' === $type ) {
 		$settings['codemirror'] = array_merge(
-			$settings['codemirror'], array(
+			$settings['codemirror'],
+			array(
 				'mode' => 'yaml',
 			)
 		);
@@ -3973,7 +3993,8 @@ function register_admin_color_schemes() {
 	$suffix .= SCRIPT_DEBUG ? '' : '.min';
 
 	wp_admin_css_color(
-		'fresh', _x( 'Default', 'admin color scheme' ),
+		'fresh',
+		_x( 'Default', 'admin color scheme' ),
 		false,
 		array( '#222', '#333', '#0073aa', '#00a0d2' ),
 		array(
@@ -3989,7 +4010,8 @@ function register_admin_color_schemes() {
 	}
 
 	wp_admin_css_color(
-		'light', _x( 'Light', 'admin color scheme' ),
+		'light',
+		_x( 'Light', 'admin color scheme' ),
 		admin_url( "css/colors/light/colors$suffix.css" ),
 		array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ),
 		array(
@@ -4000,7 +4022,8 @@ function register_admin_color_schemes() {
 	);
 
 	wp_admin_css_color(
-		'blue', _x( 'Blue', 'admin color scheme' ),
+		'blue',
+		_x( 'Blue', 'admin color scheme' ),
 		admin_url( "css/colors/blue/colors$suffix.css" ),
 		array( '#096484', '#4796b3', '#52accc', '#74B6CE' ),
 		array(
@@ -4011,7 +4034,8 @@ function register_admin_color_schemes() {
 	);
 
 	wp_admin_css_color(
-		'midnight', _x( 'Midnight', 'admin color scheme' ),
+		'midnight',
+		_x( 'Midnight', 'admin color scheme' ),
 		admin_url( "css/colors/midnight/colors$suffix.css" ),
 		array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
 		array(
@@ -4022,7 +4046,8 @@ function register_admin_color_schemes() {
 	);
 
 	wp_admin_css_color(
-		'sunrise', _x( 'Sunrise', 'admin color scheme' ),
+		'sunrise',
+		_x( 'Sunrise', 'admin color scheme' ),
 		admin_url( "css/colors/sunrise/colors$suffix.css" ),
 		array( '#b43c38', '#cf4944', '#dd823b', '#ccaf0b' ),
 		array(
@@ -4033,7 +4058,8 @@ function register_admin_color_schemes() {
 	);
 
 	wp_admin_css_color(
-		'ectoplasm', _x( 'Ectoplasm', 'admin color scheme' ),
+		'ectoplasm',
+		_x( 'Ectoplasm', 'admin color scheme' ),
 		admin_url( "css/colors/ectoplasm/colors$suffix.css" ),
 		array( '#413256', '#523f6d', '#a3b745', '#d46f15' ),
 		array(
@@ -4044,7 +4070,8 @@ function register_admin_color_schemes() {
 	);
 
 	wp_admin_css_color(
-		'ocean', _x( 'Ocean', 'admin color scheme' ),
+		'ocean',
+		_x( 'Ocean', 'admin color scheme' ),
 		admin_url( "css/colors/ocean/colors$suffix.css" ),
 		array( '#627c83', '#738e96', '#9ebaa0', '#aa9d88' ),
 		array(
@@ -4055,7 +4082,8 @@ function register_admin_color_schemes() {
 	);
 
 	wp_admin_css_color(
-		'coffee', _x( 'Coffee', 'admin color scheme' ),
+		'coffee',
+		_x( 'Coffee', 'admin color scheme' ),
 		admin_url( "css/colors/coffee/colors$suffix.css" ),
 		array( '#46403c', '#59524c', '#c7a589', '#9ea476' ),
 		array(
diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index 827e6f84bd..20790d1c44 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -1983,7 +1983,8 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 	 * @param string[] $attr Array of allowed CSS attributes.
 	 */
 	$allowed_attr = apply_filters(
-		'safe_style_css', array(
+		'safe_style_css',
+		array(
 			'background',
 			'background-color',
 
diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php
index 4aef972490..081f2cf7db 100644
--- a/wp-includes/l10n.php
+++ b/wp-includes/l10n.php
@@ -1123,7 +1123,8 @@ function wp_get_installed_translations( $type ) {
  */
 function wp_get_pomo_file_data( $po_file ) {
 	$headers = get_file_data(
-		$po_file, array(
+		$po_file,
+		array(
 			'POT-Creation-Date'  => '"POT-Creation-Date',
 			'PO-Revision-Date'   => '"PO-Revision-Date',
 			'Project-Id-Version' => '"Project-Id-Version',
@@ -1167,7 +1168,8 @@ function wp_get_pomo_file_data( $po_file ) {
 function wp_dropdown_languages( $args = array() ) {
 
 	$parsed_args = wp_parse_args(
-		$args, array(
+		$args,
+		array(
 			'id'                          => 'locale',
 			'name'                        => 'locale',
 			'languages'                   => array(),
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 47f4376d92..a56c9635ee 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -173,7 +173,8 @@ function get_permalink( $post = 0, $leavename = false ) {
 			$cats = get_the_category( $post->ID );
 			if ( $cats ) {
 				$cats = wp_list_sort(
-					$cats, array(
+					$cats,
+					array(
 						'term_id' => 'ASC',
 					)
 				);
@@ -292,7 +293,8 @@ function get_post_permalink( $id = 0, $leavename = false, $sample = false ) {
 				array(
 					'post_type' => $post->post_type,
 					'p'         => $post->ID,
-				), ''
+				),
+				''
 			);
 		}
 		$post_link = home_url( $post_link );
@@ -698,21 +700,24 @@ function get_post_comments_feed_link( $post_id = 0, $feed = '' ) {
 				array(
 					'feed'          => $feed,
 					'attachment_id' => $post_id,
-				), home_url( '/' )
+				),
+				home_url( '/' )
 			);
 		} elseif ( 'page' == $post->post_type ) {
 			$url = add_query_arg(
 				array(
 					'feed'    => $feed,
 					'page_id' => $post_id,
-				), home_url( '/' )
+				),
+				home_url( '/' )
 			);
 		} else {
 			$url = add_query_arg(
 				array(
 					'feed' => $feed,
 					'p'    => $post_id,
-				), home_url( '/' )
+				),
+				home_url( '/' )
 			);
 		}
 	}
@@ -2522,7 +2527,8 @@ function posts_nav_link( $sep = '', $prelabel = '', $nxtlabel = '' ) {
  */
 function get_the_post_navigation( $args = array() ) {
 	$args = wp_parse_args(
-		$args, array(
+		$args,
+		array(
 			'prev_text'          => '%title',
 			'next_text'          => '%title',
 			'in_same_term'       => false,
@@ -2595,7 +2601,8 @@ function get_the_posts_navigation( $args = array() ) {
 	// Don't print empty markup if there's only one page.
 	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
 		$args = wp_parse_args(
-			$args, array(
+			$args,
+			array(
 				'prev_text'          => __( 'Older posts' ),
 				'next_text'          => __( 'Newer posts' ),
 				'screen_reader_text' => __( 'Posts navigation' ),
@@ -2650,7 +2657,8 @@ function get_the_posts_pagination( $args = array() ) {
 	// Don't print empty markup if there's only one page.
 	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
 		$args = wp_parse_args(
-			$args, array(
+			$args,
+			array(
 				'mid_size'           => 1,
 				'prev_text'          => _x( 'Previous', 'previous set of posts' ),
 				'next_text'          => _x( 'Next', 'next set of posts' ),
@@ -2955,7 +2963,8 @@ function get_the_comments_navigation( $args = array() ) {
 	// Are there comments to navigate through?
 	if ( get_comment_pages_count() > 1 ) {
 		$args = wp_parse_args(
-			$args, array(
+			$args,
+			array(
 				'prev_text'          => __( 'Older comments' ),
 				'next_text'          => __( 'Newer comments' ),
 				'screen_reader_text' => __( 'Comments navigation' ),
@@ -3007,7 +3016,8 @@ function the_comments_navigation( $args = array() ) {
 function get_the_comments_pagination( $args = array() ) {
 	$navigation   = '';
 	$args         = wp_parse_args(
-		$args, array(
+		$args,
+		array(
 			'screen_reader_text' => __( 'Comments navigation' ),
 		)
 	);
@@ -3965,7 +3975,8 @@ function get_avatar_url( $id_or_email, $args = null ) {
  */
 function get_avatar_data( $id_or_email, $args = null ) {
 	$args = wp_parse_args(
-		$args, array(
+		$args,
+		array(
 			'size'           => 96,
 			'height'         => null,
 			'width'          => null,
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 81014fdde8..79e445021b 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -225,7 +225,7 @@ function wp_maintenance() {
 	if ( is_rtl() ) {
 		$dir_attr = ' dir="rtl"';
 	}
-?>
+	?>
 	<!DOCTYPE html>
 	<html xmlns="http://www.w3.org/1999/xhtml"<?php echo $dir_attr; ?>>
 	<head>
@@ -237,7 +237,7 @@ function wp_maintenance() {
 		<h1><?php _e( 'Briefly unavailable for scheduled maintenance. Check back in a minute.' ); ?></h1>
 	</body>
 	</html>
-<?php
+	<?php
 	die();
 }
 
diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index 0dbba580f4..fc44cc655a 100644
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -15,7 +15,7 @@
  */
 function wp_underscore_audio_template() {
 	$audio_types = wp_get_audio_extensions();
-?>
+	?>
 <audio style="visibility: hidden"
 	controls
 	class="wp-audio-shortcode"
@@ -24,7 +24,7 @@ function wp_underscore_audio_template() {
 	<#
 	<?php
 	foreach ( array( 'autoplay', 'loop' ) as $attr ) :
-	?>
+		?>
 	if ( ! _.isUndefined( data.model.<?php echo $attr; ?> ) && data.model.<?php echo $attr; ?> ) {
 		#> <?php echo $attr; ?><#
 	}
@@ -36,15 +36,15 @@ function wp_underscore_audio_template() {
 
 	<?php
 	foreach ( $audio_types as $type ) :
-	?>
+		?>
 	<# if ( ! _.isEmpty( data.model.<?php echo $type; ?> ) ) { #>
 	<source src="{{ data.model.<?php echo $type; ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $type; ?>' ] }}" />
 	<# } #>
-	<?php
+		<?php
 	endforeach;
-?>
+	?>
 </audio>
-<?php
+	<?php
 }
 
 /**
@@ -55,7 +55,7 @@ function wp_underscore_audio_template() {
  */
 function wp_underscore_video_template() {
 	$video_types = wp_get_video_extensions();
-?>
+	?>
 <#  var w_rule = '', classes = [],
 		w, h, settings = wp.media.view.settings,
 		isYouTube = isVimeo = false;
@@ -96,18 +96,18 @@ function wp_underscore_video_template() {
 	<# if ( w ) { #>width="{{ w }}"<# } #>
 	<# if ( h ) { #>height="{{ h }}"<# } #>
 	<?php
-	$props       = array(
+	$props = array(
 		'poster'  => '',
 		'preload' => 'metadata',
 	);
 	foreach ( $props as $key => $value ) :
 		if ( empty( $value ) ) {
-		?>
+			?>
 		<#
 		if ( ! _.isUndefined( data.model.<?php echo $key; ?> ) && data.model.<?php echo $key; ?> ) {
 			#> <?php echo $key; ?>="{{ data.model.<?php echo $key; ?> }}"<#
 		} #>
-		<?php
+			<?php
 		} else {
 			echo $key
 			?>
@@ -119,7 +119,7 @@ function wp_underscore_video_template() {
 	<#
 	<?php
 	foreach ( array( 'autoplay', 'loop' ) as $attr ) :
-	?>
+		?>
 	if ( ! _.isUndefined( data.model.<?php echo $attr; ?> ) && data.model.<?php echo $attr; ?> ) {
 		#> <?php echo $attr; ?><#
 	}
@@ -137,7 +137,7 @@ function wp_underscore_video_template() {
 
 	<?php
 	foreach ( $video_types as $type ) :
-	?>
+		?>
 	<# if ( data.model.<?php echo $type; ?> ) { #>
 	<source src="{{ data.model.<?php echo $type; ?> }}" type="{{ settings.embedMimes[ '<?php echo $type; ?>' ] }}" />
 	<# } #>
@@ -145,7 +145,7 @@ function wp_underscore_video_template() {
 	{{{ data.model.content }}}
 </video>
 </div>
-<?php
+	<?php
 }
 
 /**
@@ -413,7 +413,7 @@ function wp_print_media_templates() {
 					'artist' => __( 'Artist' ),
 					'album'  => __( 'Album' ),
 				) as $key => $label ) :
-				?>
+					?>
 				<label class="setting" data-setting="<?php echo esc_attr( $key ); ?>">
 					<span class="name"><?php echo $label; ?></span>
 					<input type="text" value="{{ data.<?php echo $key; ?> || data.meta.<?php echo $key; ?> || '' }}" />
@@ -596,7 +596,7 @@ function wp_print_media_templates() {
 			'artist' => __( 'Artist' ),
 			'album'  => __( 'Album' ),
 		) as $key => $label ) :
-		?>
+			?>
 		<label class="setting" data-setting="<?php echo esc_attr( $key ); ?>">
 			<span class="name"><?php echo $label; ?></span>
 			<input type="text" value="{{ data.<?php echo $key; ?> || data.meta.<?php echo $key; ?> || '' }}" />
@@ -719,7 +719,8 @@ function wp_print_media_templates() {
 					<?php
 					/** This filter is documented in wp-admin/includes/media.php */
 					$sizes = apply_filters(
-						'image_size_names_choose', array(
+						'image_size_names_choose',
+						array(
 							'thumbnail' => __( 'Thumbnail' ),
 							'medium'    => __( 'Medium' ),
 							'large'     => __( 'Large' ),
@@ -728,7 +729,7 @@ function wp_print_media_templates() {
 					);
 
 					foreach ( $sizes as $value => $name ) :
-					?>
+						?>
 						<#
 						var size = data.sizes['<?php echo esc_js( $value ); ?>'];
 						if ( size ) { #>
@@ -797,7 +798,8 @@ function wp_print_media_templates() {
 				<?php
 				/** This filter is documented in wp-admin/includes/media.php */
 				$size_names = apply_filters(
-					'image_size_names_choose', array(
+					'image_size_names_choose',
+					array(
 						'thumbnail' => __( 'Thumbnail' ),
 						'medium'    => __( 'Medium' ),
 						'large'     => __( 'Large' ),
@@ -806,7 +808,7 @@ function wp_print_media_templates() {
 				);
 
 				foreach ( $size_names as $size => $label ) :
-				?>
+					?>
 					<option value="<?php echo esc_attr( $size ); ?>">
 						<?php echo esc_html( $label ); ?>
 					</option>
@@ -867,7 +869,7 @@ function wp_print_media_templates() {
 		<?php
 		/** This filter is documented in wp-admin/includes/media.php */
 		if ( ! apply_filters( 'disable_captions', '' ) ) :
-		?>
+			?>
 			<label class="setting caption">
 				<span><?php _e( 'Caption' ); ?></span>
 				<textarea data-setting="caption" />
@@ -933,7 +935,7 @@ function wp_print_media_templates() {
 					<?php
 					/** This filter is documented in wp-admin/includes/media.php */
 					if ( ! apply_filters( 'disable_captions', '' ) ) :
-					?>
+						?>
 						<label class="setting caption">
 							<span><?php _e( 'Caption' ); ?></span>
 							<textarea data-setting="caption">{{ data.model.caption }}</textarea>
@@ -976,7 +978,8 @@ function wp_print_media_templates() {
 									<?php
 									/** This filter is documented in wp-admin/includes/media.php */
 									$sizes = apply_filters(
-										'image_size_names_choose', array(
+										'image_size_names_choose',
+										array(
 											'thumbnail' => __( 'Thumbnail' ),
 											'medium'    => __( 'Medium' ),
 											'large'     => __( 'Large' ),
@@ -985,7 +988,7 @@ function wp_print_media_templates() {
 									);
 
 									foreach ( $sizes as $value => $name ) :
-									?>
+										?>
 										<#
 										var size = data.sizes['<?php echo esc_js( $value ); ?>'];
 										if ( size ) { #>
@@ -1093,7 +1096,7 @@ function wp_print_media_templates() {
 				<?php
 
 				foreach ( $audio_types as $type ) :
-				?>
+					?>
 				<# if ( ! _.isEmpty( data.model.<?php echo $type; ?> ) ) {
 					if ( ! _.isUndefined( html5types.<?php echo $type; ?> ) ) {
 						delete html5types.<?php echo $type; ?>;
@@ -1176,7 +1179,7 @@ function wp_print_media_templates() {
 				<# } #>
 				<?php
 				foreach ( $video_types as $type ) :
-				?>
+					?>
 				<# if ( ! _.isEmpty( data.model.<?php echo $type; ?> ) ) {
 					if ( ! _.isUndefined( html5types.<?php echo $type; ?> ) ) {
 						delete html5types.<?php echo $type; ?>;
diff --git a/wp-includes/media.php b/wp-includes/media.php
index c93c3dbabf..33c2e83644 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1552,7 +1552,9 @@ function img_caption_shortcode( $attr, $content = null ) {
 			'width'      => '',
 			'caption'    => '',
 			'class'      => '',
-		), $attr, 'caption'
+		),
+		$attr,
+		'caption'
 	);
 
 	$atts['width'] = (int) $atts['width'];
@@ -1722,7 +1724,9 @@ function gallery_shortcode( $attr ) {
 			'include'    => '',
 			'exclude'    => '',
 			'link'       => '',
-		), $attr, 'gallery'
+		),
+		$attr,
+		'gallery'
 	);
 
 	$id = intval( $atts['id'] );
@@ -1897,7 +1901,7 @@ function gallery_shortcode( $attr ) {
  * @since 3.9.0
  */
 function wp_underscore_playlist_templates() {
-?>
+	?>
 <script type="text/html" id="tmpl-wp-playlist-current-item">
 	<# if ( data.image ) { #>
 	<img src="{{ data.thumb.src }}" alt="" />
@@ -1936,7 +1940,7 @@ function wp_underscore_playlist_templates() {
 		<# } #>
 	</div>
 </script>
-<?php
+	<?php
 }
 
 /**
@@ -1949,9 +1953,9 @@ function wp_underscore_playlist_templates() {
 function wp_playlist_scripts( $type ) {
 	wp_enqueue_style( 'wp-mediaelement' );
 	wp_enqueue_script( 'wp-playlist' );
-?>
+	?>
 <!--[if lt IE 9]><script>document.createElement('<?php echo esc_js( $type ); ?>');</script><![endif]-->
-<?php
+	<?php
 	add_action( 'wp_footer', 'wp_underscore_playlist_templates', 0 );
 	add_action( 'admin_footer', 'wp_underscore_playlist_templates', 0 );
 }
@@ -2039,7 +2043,9 @@ function wp_playlist_shortcode( $attr ) {
 			'tracknumbers' => true,
 			'images'       => true,
 			'artists'      => true,
-		), $attr, 'playlist'
+		),
+		$attr,
+		'playlist'
 	);
 
 	$id = intval( $atts['id'] );
@@ -2188,7 +2194,7 @@ function wp_playlist_shortcode( $attr ) {
 	<<?php echo $safe_type; ?> controls="controls" preload="none" width="
 				<?php
 				echo (int) $theme_width;
-	?>
+				?>
 	"
 	<?php
 	if ( 'video' === $safe_type ) :
@@ -3294,7 +3300,8 @@ function wp_prepare_attachment_for_js( $attachment ) {
 
 		/** This filter is documented in wp-admin/includes/media.php */
 		$possible_sizes = apply_filters(
-			'image_size_names_choose', array(
+			'image_size_names_choose',
+			array(
 				'thumbnail' => __( 'Thumbnail' ),
 				'medium'    => __( 'Medium' ),
 				'large'     => __( 'Large' ),
@@ -3560,7 +3567,8 @@ function wp_enqueue_media( $args = array() ) {
 			FROM $wpdb->posts
 			WHERE post_type = %s
 			ORDER BY post_date DESC
-		", 'attachment'
+		",
+				'attachment'
 			)
 		);
 	}
@@ -4126,7 +4134,7 @@ function wp_media_personal_data_exporter( $email_address, $page = 1 ) {
 
 	$data_to_export = array();
 
-	$user = get_user_by( 'email' , $email_address );
+	$user = get_user_by( 'email', $email_address );
 	if ( false === $user ) {
 		return array(
 			'data' => $data_to_export,
@@ -4151,7 +4159,10 @@ function wp_media_personal_data_exporter( $email_address, $page = 1 ) {
 
 		if ( $attachment_url ) {
 			$post_data_to_export = array(
-				array( 'name'  => __( 'URL' ), 'value' => $attachment_url ),
+				array(
+					'name'  => __( 'URL' ),
+					'value' => $attachment_url,
+				),
 			);
 
 			$data_to_export[] = array(
diff --git a/wp-includes/meta.php b/wp-includes/meta.php
index 7d51b20b92..364c632793 100644
--- a/wp-includes/meta.php
+++ b/wp-includes/meta.php
@@ -77,7 +77,8 @@ function add_metadata( $meta_type, $object_id, $meta_key, $meta_value, $unique =
 	if ( $unique && $wpdb->get_var(
 		$wpdb->prepare(
 			"SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
-			$meta_key, $object_id
+			$meta_key,
+			$object_id
 		)
 	) ) {
 		return false;
@@ -101,7 +102,8 @@ function add_metadata( $meta_type, $object_id, $meta_key, $meta_value, $unique =
 	do_action( "add_{$meta_type}_meta", $object_id, $meta_key, $_meta_value );
 
 	$result = $wpdb->insert(
-		$table, array(
+		$table,
+		array(
 			$column      => $object_id,
 			'meta_key'   => $meta_key,
 			'meta_value' => $meta_value,
diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index ec60a200d7..a910789cb6 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -1439,9 +1439,12 @@ function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
 		return $value;
 	}
 
-	$result = wp_update_site( $blog_id, array(
-		$pref => $value,
-	) );
+	$result = wp_update_site(
+		$blog_id,
+		array(
+			$pref => $value,
+		)
+	);
 
 	if ( is_wp_error( $result ) ) {
 		return false;
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 6e5233222b..80c988ae36 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -498,7 +498,7 @@ function wpmu_validate_user_signup( $user_name, $user_email ) {
 	$limited_email_domains = get_site_option( 'limited_email_domains' );
 	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
 		$limited_email_domains = array_map( 'strtolower', $limited_email_domains );
-		$emaildomain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
+		$emaildomain           = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
 		if ( ! in_array( $emaildomain, $limited_email_domains, true ) ) {
 			$errors->add( 'user_email', __( 'Sorry, that email address is not allowed!' ) );
 		}
@@ -692,7 +692,8 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 		// If registered more than two days ago, cancel registration and let this signup go through.
 		if ( $diff > 2 * DAY_IN_SECONDS ) {
 			$wpdb->delete(
-				$wpdb->signups, array(
+				$wpdb->signups,
+				array(
 					'domain' => $mydomain,
 					'path'   => $path,
 				)
@@ -767,7 +768,8 @@ function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = a
 	$meta = apply_filters( 'signup_site_meta', $meta, $domain, $path, $title, $user, $user_email, $key );
 
 	$wpdb->insert(
-		$wpdb->signups, array(
+		$wpdb->signups,
+		array(
 			'domain'         => $domain,
 			'path'           => $path,
 			'title'          => $title,
@@ -832,7 +834,8 @@ function wpmu_signup_user( $user, $user_email, $meta = array() ) {
 	$meta = apply_filters( 'signup_user_meta', $meta, $user, $user_email, $key );
 
 	$wpdb->insert(
-		$wpdb->signups, array(
+		$wpdb->signups,
+		array(
 			'domain'         => '',
 			'path'           => '',
 			'title'          => '',
@@ -938,7 +941,13 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user_login, $us
 		apply_filters(
 			'wpmu_signup_blog_notification_email',
 			__( "To activate your blog, please click the following link:\n\n%1\$s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%2\$s" ),
-			$domain, $path, $title, $user_login, $user_email, $key, $meta
+			$domain,
+			$path,
+			$title,
+			$user_login,
+			$user_email,
+			$key,
+			$meta
 		),
 		$activate_url,
 		esc_url( "http://{$domain}{$path}" ),
@@ -964,7 +973,13 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user_login, $us
 			'wpmu_signup_blog_notification_subject',
 			/* translators: New site notification email subject. 1: Network name, 2: New site URL */
 			_x( '[%1$s] Activate %2$s', 'New site notification email subject' ),
-			$domain, $path, $title, $user_login, $user_email, $key, $meta
+			$domain,
+			$path,
+			$title,
+			$user_login,
+			$user_email,
+			$key,
+			$meta
 		),
 		$from_name,
 		esc_url( 'http://' . $domain . $path )
@@ -1042,7 +1057,10 @@ function wpmu_signup_user_notification( $user_login, $user_email, $key, $meta =
 		apply_filters(
 			'wpmu_signup_user_notification_email',
 			__( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ),
-			$user_login, $user_email, $key, $meta
+			$user_login,
+			$user_email,
+			$key,
+			$meta
 		),
 		site_url( "wp-activate.php?key=$key" )
 	);
@@ -1063,7 +1081,10 @@ function wpmu_signup_user_notification( $user_login, $user_email, $key, $meta =
 			'wpmu_signup_user_notification_subject',
 			/* translators: New user notification email subject. 1: Network name, 2: New user login */
 			_x( '[%1$s] Activate %2$s', 'New user notification email subject' ),
-			$user_login, $user_email, $key, $meta
+			$user_login,
+			$user_email,
+			$key,
+			$meta
 		),
 		$from_name,
 		$user_login
@@ -1128,10 +1149,12 @@ function wpmu_activate_signup( $key ) {
 
 	if ( empty( $signup->domain ) ) {
 		$wpdb->update(
-			$wpdb->signups, array(
+			$wpdb->signups,
+			array(
 				'active'    => 1,
 				'activated' => $now,
-			), array( 'activation_key' => $key )
+			),
+			array( 'activation_key' => $key )
 		);
 
 		if ( isset( $user_already_exists ) ) {
@@ -1164,20 +1187,24 @@ function wpmu_activate_signup( $key ) {
 		if ( 'blog_taken' == $blog_id->get_error_code() ) {
 			$blog_id->add_data( $signup );
 			$wpdb->update(
-				$wpdb->signups, array(
+				$wpdb->signups,
+				array(
 					'active'    => 1,
 					'activated' => $now,
-				), array( 'activation_key' => $key )
+				),
+				array( 'activation_key' => $key )
 			);
 		}
 		return $blog_id;
 	}
 
 	$wpdb->update(
-		$wpdb->signups, array(
+		$wpdb->signups,
+		array(
 			'active'    => 1,
 			'activated' => $now,
-		), array( 'activation_key' => $key )
+		),
+		array( 'activation_key' => $key )
 	);
 	/**
 	 * Fires immediately after a site is activated.
@@ -1385,7 +1412,11 @@ URL: %2$s
 Remote IP address: %3$s
 
 Disable these notifications: %4$s'
-		), $blogname, $siteurl, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url
+		),
+		$blogname,
+		$siteurl,
+		wp_unslash( $_SERVER['REMOTE_ADDR'] ),
+		$options_site_url
 	);
 	/**
 	 * Filters the message body of the new site activation email sent
@@ -1433,7 +1464,10 @@ function newuser_notify_siteadmin( $user_id ) {
 Remote IP address: %2$s
 
 Disable these notifications: %3$s'
-		), $user->user_login, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url
+		),
+		$user->user_login,
+		wp_unslash( $_SERVER['REMOTE_ADDR'] ),
+		$options_site_url
 	);
 
 	/**
@@ -2001,7 +2035,8 @@ function wpmu_log_new_registrations( $blog_id, $user_id ) {
 	$user = get_userdata( (int) $user_id );
 	if ( $user ) {
 		$wpdb->insert(
-			$wpdb->registration_log, array(
+			$wpdb->registration_log,
+			array(
 				'email'           => $user->user_email,
 				'IP'              => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ),
 				'blog_id'         => $blog_id,
@@ -2050,7 +2085,8 @@ function global_terms( $term_id, $deprecated = '' ) {
 		$used_global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id ) );
 		if ( null == $used_global_id ) {
 			$wpdb->insert(
-				$wpdb->sitecategories, array(
+				$wpdb->sitecategories,
+				array(
 					'cat_ID'            => $term_id,
 					'cat_name'          => $c->name,
 					'category_nicename' => $c->slug,
@@ -2065,7 +2101,8 @@ function global_terms( $term_id, $deprecated = '' ) {
 			$max_local_id  = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
 			$new_global_id = max( $max_global_id, $max_local_id ) + mt_rand( 100, 400 );
 			$wpdb->insert(
-				$wpdb->sitecategories, array(
+				$wpdb->sitecategories,
+				array(
 					'cat_ID'            => $new_global_id,
 					'cat_name'          => $c->name,
 					'category_nicename' => $c->slug,
@@ -2890,9 +2927,12 @@ All at ###SITENAME###
 	$email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
 
 	wp_mail(
-		$email_change_email['to'], sprintf(
+		$email_change_email['to'],
+		sprintf(
 			$email_change_email['subject'],
 			$network_name
-		), $email_change_email['message'], $email_change_email['headers']
+		),
+		$email_change_email['message'],
+		$email_change_email['headers']
 	);
 }
diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index 8624b85043..2c8a64ade7 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -448,9 +448,12 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 			$_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
 
 			$matches = array(
-				$current_url,            urldecode( $current_url ),
-				$_indexless_current,     urldecode( $_indexless_current ),
-				$_root_relative_current, urldecode( $_root_relative_current ),
+				$current_url,
+				urldecode( $current_url ),
+				$_indexless_current,
+				urldecode( $_indexless_current ),
+				$_root_relative_current,
+				urldecode( $_root_relative_current ),
 			);
 
 			if ( $raw_item_url && in_array( $item_url, $matches ) ) {
diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 6ce589bb4f..79f89d62d1 100644
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -723,7 +723,8 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
 		if ( ! empty( $terms ) ) {
 			foreach ( array_keys( $terms ) as $taxonomy ) {
 				get_terms(
-					$taxonomy, array(
+					$taxonomy,
+					array(
 						'include'      => $terms[ $taxonomy ],
 						'hierarchical' => false,
 					)
@@ -741,7 +742,8 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
 
 	if ( ARRAY_A == $args['output'] ) {
 		$items = wp_list_sort(
-			$items, array(
+			$items,
+			array(
 				$args['output_key'] => 'ASC',
 			)
 		);
diff --git a/wp-includes/option.php b/wp-includes/option.php
index a80de70784..8ae0b68595 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -1384,7 +1384,8 @@ function add_network_option( $network_id, $option, $value ) {
 
 		$serialized_value = maybe_serialize( $value );
 		$result           = $wpdb->insert(
-			$wpdb->sitemeta, array(
+			$wpdb->sitemeta,
+			array(
 				'site_id'    => $network_id,
 				'meta_key'   => $option,
 				'meta_value' => $serialized_value,
@@ -1492,7 +1493,8 @@ function delete_network_option( $network_id, $option ) {
 		wp_cache_delete( $cache_key, 'site-options' );
 
 		$result = $wpdb->delete(
-			$wpdb->sitemeta, array(
+			$wpdb->sitemeta,
+			array(
 				'meta_key' => $option,
 				'site_id'  => $network_id,
 			)
@@ -1603,7 +1605,9 @@ function update_network_option( $network_id, $option, $value ) {
 
 		$serialized_value = maybe_serialize( $value );
 		$result           = $wpdb->update(
-			$wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array(
+			$wpdb->sitemeta,
+			array( 'meta_value' => $serialized_value ),
+			array(
 				'site_id'  => $network_id,
 				'meta_key' => $option,
 			)
@@ -1873,7 +1877,9 @@ function set_site_transient( $transient, $value, $expiration = 0 ) {
  */
 function register_initial_settings() {
 	register_setting(
-		'general', 'blogname', array(
+		'general',
+		'blogname',
+		array(
 			'show_in_rest' => array(
 				'name' => 'title',
 			),
@@ -1883,7 +1889,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'general', 'blogdescription', array(
+		'general',
+		'blogdescription',
+		array(
 			'show_in_rest' => array(
 				'name' => 'description',
 			),
@@ -1894,7 +1902,9 @@ function register_initial_settings() {
 
 	if ( ! is_multisite() ) {
 		register_setting(
-			'general', 'siteurl', array(
+			'general',
+			'siteurl',
+			array(
 				'show_in_rest' => array(
 					'name'   => 'url',
 					'schema' => array(
@@ -1909,7 +1919,9 @@ function register_initial_settings() {
 
 	if ( ! is_multisite() ) {
 		register_setting(
-			'general', 'admin_email', array(
+			'general',
+			'admin_email',
+			array(
 				'show_in_rest' => array(
 					'name'   => 'email',
 					'schema' => array(
@@ -1923,7 +1935,9 @@ function register_initial_settings() {
 	}
 
 	register_setting(
-		'general', 'timezone_string', array(
+		'general',
+		'timezone_string',
+		array(
 			'show_in_rest' => array(
 				'name' => 'timezone',
 			),
@@ -1933,7 +1947,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'general', 'date_format', array(
+		'general',
+		'date_format',
+		array(
 			'show_in_rest' => true,
 			'type'         => 'string',
 			'description'  => __( 'A date format for all date strings.' ),
@@ -1941,7 +1957,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'general', 'time_format', array(
+		'general',
+		'time_format',
+		array(
 			'show_in_rest' => true,
 			'type'         => 'string',
 			'description'  => __( 'A time format for all time strings.' ),
@@ -1949,7 +1967,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'general', 'start_of_week', array(
+		'general',
+		'start_of_week',
+		array(
 			'show_in_rest' => true,
 			'type'         => 'integer',
 			'description'  => __( 'A day number of the week that the week should start on.' ),
@@ -1957,7 +1977,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'general', 'WPLANG', array(
+		'general',
+		'WPLANG',
+		array(
 			'show_in_rest' => array(
 				'name' => 'language',
 			),
@@ -1968,7 +1990,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'writing', 'use_smilies', array(
+		'writing',
+		'use_smilies',
+		array(
 			'show_in_rest' => true,
 			'type'         => 'boolean',
 			'description'  => __( 'Convert emoticons like :-) and :-P to graphics on display.' ),
@@ -1977,7 +2001,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'writing', 'default_category', array(
+		'writing',
+		'default_category',
+		array(
 			'show_in_rest' => true,
 			'type'         => 'integer',
 			'description'  => __( 'Default post category.' ),
@@ -1985,7 +2011,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'writing', 'default_post_format', array(
+		'writing',
+		'default_post_format',
+		array(
 			'show_in_rest' => true,
 			'type'         => 'string',
 			'description'  => __( 'Default post format.' ),
@@ -1993,7 +2021,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'reading', 'posts_per_page', array(
+		'reading',
+		'posts_per_page',
+		array(
 			'show_in_rest' => true,
 			'type'         => 'integer',
 			'description'  => __( 'Blog pages show at most.' ),
@@ -2002,7 +2032,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'discussion', 'default_ping_status', array(
+		'discussion',
+		'default_ping_status',
+		array(
 			'show_in_rest' => array(
 				'schema' => array(
 					'enum' => array( 'open', 'closed' ),
@@ -2014,7 +2046,9 @@ function register_initial_settings() {
 	);
 
 	register_setting(
-		'discussion', 'default_comment_status', array(
+		'discussion',
+		'default_comment_status',
+		array(
 			'show_in_rest' => array(
 				'schema' => array(
 					'enum' => array( 'open', 'closed' ),
@@ -2025,11 +2059,15 @@ function register_initial_settings() {
 		)
 	);
 
-	register_setting( 'permalink', 'permalink_structure', array(
-		'show_in_rest' => true,
-		'type'         => 'string',
-		'description'  => __( 'Custom URL structure for permalinks and archives.' ),
-	) );
+	register_setting(
+		'permalink',
+		'permalink_structure',
+		array(
+			'show_in_rest' => true,
+			'type'         => 'string',
+			'description'  => __( 'Custom URL structure for permalinks and archives.' ),
+		)
+	);
 }
 
 /**
@@ -2092,7 +2130,8 @@ function register_setting( $option_group, $option_name, $args = array() ) {
 
 	if ( 'misc' == $option_group ) {
 		_deprecated_argument(
-			__FUNCTION__, '3.0.0',
+			__FUNCTION__,
+			'3.0.0',
 			/* translators: %s: misc */
 			sprintf(
 				__( 'The "%s" options group has been removed. Use another settings group.' ),
@@ -2104,7 +2143,8 @@ function register_setting( $option_group, $option_name, $args = array() ) {
 
 	if ( 'privacy' == $option_group ) {
 		_deprecated_argument(
-			__FUNCTION__, '3.5.0',
+			__FUNCTION__,
+			'3.5.0',
 			/* translators: %s: privacy */
 			sprintf(
 				__( 'The "%s" options group has been removed. Use another settings group.' ),
@@ -2142,7 +2182,8 @@ function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
 
 	if ( 'misc' == $option_group ) {
 		_deprecated_argument(
-			__FUNCTION__, '3.0.0',
+			__FUNCTION__,
+			'3.0.0',
 			/* translators: %s: misc */
 			sprintf(
 				__( 'The "%s" options group has been removed. Use another settings group.' ),
@@ -2154,7 +2195,8 @@ function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
 
 	if ( 'privacy' == $option_group ) {
 		_deprecated_argument(
-			__FUNCTION__, '3.5.0',
+			__FUNCTION__,
+			'3.5.0',
 			/* translators: %s: privacy */
 			sprintf(
 				__( 'The "%s" options group has been removed. Use another settings group.' ),
@@ -2170,7 +2212,8 @@ function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
 	}
 	if ( '' !== $deprecated ) {
 		_deprecated_argument(
-			__FUNCTION__, '4.7.0',
+			__FUNCTION__,
+			'4.7.0',
 			/* translators: 1: $sanitize_callback, 2: register_setting() */
 			sprintf(
 				__( '%1$s is deprecated. The callback from %2$s is used instead.' ),
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index cb06297b57..58dd365146 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -1336,7 +1336,7 @@ if ( ! function_exists( 'wp_safe_redirect' ) ) :
 	 * @param string $location      The path or URL to redirect to.
 	 * @param int    $status        Optional. HTTP response status code to use. Default '302' (Moved Temporarily).
 	 * @param string $x_redirect_by Optional. The application doing the redirect. Default 'WordPress'.
- 	 * @return bool  $redirect False if the redirect was cancelled, true otherwise.
+	 * @return bool  $redirect False if the redirect was cancelled, true otherwise.
 	 */
 	function wp_safe_redirect( $location, $status = 302, $x_redirect_by = 'WordPress' ) {
 
@@ -1753,8 +1753,10 @@ if ( ! function_exists( 'wp_notify_moderator' ) ) :
 		$notify_message .= sprintf(
 			_n(
 				'Currently %s comment is waiting for approval. Please visit the moderation panel:',
-				'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting
-			), number_format_i18n( $comments_waiting )
+				'Currently %s comments are waiting for approval. Please visit the moderation panel:',
+				$comments_waiting
+			),
+			number_format_i18n( $comments_waiting )
 		) . "\r\n";
 		$notify_message .= admin_url( 'edit-comments.php?comment_status=moderated#wpbody-content' ) . "\r\n";
 
@@ -2489,10 +2491,12 @@ if ( ! function_exists( 'wp_set_password' ) ) :
 
 		$hash = wp_hash_password( $password );
 		$wpdb->update(
-			$wpdb->users, array(
+			$wpdb->users,
+			array(
 				'user_pass'           => $hash,
 				'user_activation_key' => '',
-			), array( 'ID' => $user_id )
+			),
+			array( 'ID' => $user_id )
 		);
 
 		wp_cache_delete( $user_id, 'users' );
diff --git a/wp-includes/pomo/mo.php b/wp-includes/pomo/mo.php
index 6ec35245b9..44d8cdfc87 100644
--- a/wp-includes/pomo/mo.php
+++ b/wp-includes/pomo/mo.php
@@ -107,9 +107,16 @@ if ( ! class_exists( 'MO', false ) ) :
 			$hash_addr                 = $translations_lenghts_addr + 8 * $total;
 			$current_addr              = $hash_addr;
 			fwrite(
-				$fh, pack(
-					'V*', $magic, $revision, $total, $originals_lenghts_addr,
-					$translations_lenghts_addr, $size_of_hash, $hash_addr
+				$fh,
+				pack(
+					'V*',
+					$magic,
+					$revision,
+					$total,
+					$originals_lenghts_addr,
+					$translations_lenghts_addr,
+					$size_of_hash,
+					$hash_addr
 				)
 			);
 			fseek( $fh, $originals_lenghts_addr );
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 911c62dba8..3c2b782d4a 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -19,7 +19,8 @@
  */
 function create_initial_post_types() {
 	register_post_type(
-		'post', array(
+		'post',
+		array(
 			'labels'                => array(
 				'name_admin_bar' => _x( 'Post', 'add new from admin bar' ),
 			),
@@ -41,7 +42,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_type(
-		'page', array(
+		'page',
+		array(
 			'labels'                => array(
 				'name_admin_bar' => _x( 'Page', 'add new from admin bar' ),
 			),
@@ -64,7 +66,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_type(
-		'attachment', array(
+		'attachment',
+		array(
 			'labels'                => array(
 				'name'           => _x( 'Media', 'post type general name' ),
 				'name_admin_bar' => _x( 'Media', 'add new from admin bar' ),
@@ -97,7 +100,8 @@ function create_initial_post_types() {
 	add_post_type_support( 'attachment:video', 'thumbnail' );
 
 	register_post_type(
-		'revision', array(
+		'revision',
+		array(
 			'labels'           => array(
 				'name'          => __( 'Revisions' ),
 				'singular_name' => __( 'Revision' ),
@@ -117,7 +121,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_type(
-		'nav_menu_item', array(
+		'nav_menu_item',
+		array(
 			'labels'           => array(
 				'name'          => __( 'Navigation Menu Items' ),
 				'singular_name' => __( 'Navigation Menu Item' ),
@@ -132,7 +137,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_type(
-		'custom_css', array(
+		'custom_css',
+		array(
 			'labels'           => array(
 				'name'          => __( 'Custom CSS' ),
 				'singular_name' => __( 'Custom CSS' ),
@@ -163,7 +169,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_type(
-		'customize_changeset', array(
+		'customize_changeset',
+		array(
 			'labels'           => array(
 				'name'               => _x( 'Changesets', 'post type general name' ),
 				'singular_name'      => _x( 'Changeset', 'post type singular name' ),
@@ -210,7 +217,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_type(
-		'oembed_cache', array(
+		'oembed_cache',
+		array(
 			'labels'           => array(
 				'name'          => __( 'oEmbed Responses' ),
 				'singular_name' => __( 'oEmbed Response' ),
@@ -227,7 +235,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_type(
-		'user_request', array(
+		'user_request',
+		array(
 			'labels'           => array(
 				'name'          => __( 'User Requests' ),
 				'singular_name' => __( 'User Request' ),
@@ -244,7 +253,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'publish', array(
+		'publish',
+		array(
 			'label'       => _x( 'Published', 'post status' ),
 			'public'      => true,
 			'_builtin'    => true, /* internal use only. */
@@ -253,7 +263,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'future', array(
+		'future',
+		array(
 			'label'       => _x( 'Scheduled', 'post status' ),
 			'protected'   => true,
 			'_builtin'    => true, /* internal use only. */
@@ -262,7 +273,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'draft', array(
+		'draft',
+		array(
 			'label'       => _x( 'Draft', 'post status' ),
 			'protected'   => true,
 			'_builtin'    => true, /* internal use only. */
@@ -271,7 +283,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'pending', array(
+		'pending',
+		array(
 			'label'       => _x( 'Pending', 'post status' ),
 			'protected'   => true,
 			'_builtin'    => true, /* internal use only. */
@@ -280,7 +293,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'private', array(
+		'private',
+		array(
 			'label'       => _x( 'Private', 'post status' ),
 			'private'     => true,
 			'_builtin'    => true, /* internal use only. */
@@ -289,7 +303,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'trash', array(
+		'trash',
+		array(
 			'label'                     => _x( 'Trash', 'post status' ),
 			'internal'                  => true,
 			'_builtin'                  => true, /* internal use only. */
@@ -299,7 +314,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'auto-draft', array(
+		'auto-draft',
+		array(
 			'label'    => 'auto-draft',
 			'internal' => true,
 			'_builtin' => true, /* internal use only. */
@@ -307,7 +323,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'inherit', array(
+		'inherit',
+		array(
 			'label'               => 'inherit',
 			'internal'            => true,
 			'_builtin'            => true, /* internal use only. */
@@ -316,7 +333,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'request-pending', array(
+		'request-pending',
+		array(
 			'label'               => _x( 'Pending', 'request status' ),
 			'internal'            => true,
 			'_builtin'            => true, /* internal use only. */
@@ -325,7 +343,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'request-confirmed', array(
+		'request-confirmed',
+		array(
 			'label'               => _x( 'Confirmed', 'request status' ),
 			'internal'            => true,
 			'_builtin'            => true, /* internal use only. */
@@ -334,7 +353,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'request-failed', array(
+		'request-failed',
+		array(
 			'label'               => _x( 'Failed', 'request status' ),
 			'internal'            => true,
 			'_builtin'            => true, /* internal use only. */
@@ -343,7 +363,8 @@ function create_initial_post_types() {
 	);
 
 	register_post_status(
-		'request-completed', array(
+		'request-completed',
+		array(
 			'label'               => _x( 'Completed', 'request status' ),
 			'internal'            => true,
 			'_builtin'            => true, /* internal use only. */
@@ -4701,7 +4722,8 @@ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' )
 			FROM $wpdb->posts
 			WHERE post_title = %s
 			AND post_type IN ($post_type_in_string)
-		", $page_title
+		",
+			$page_title
 		);
 	} else {
 		$sql = $wpdb->prepare(
@@ -4710,7 +4732,9 @@ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' )
 			FROM $wpdb->posts
 			WHERE post_title = %s
 			AND post_type = %s
-		", $page_title, $post_type
+		",
+			$page_title,
+			$post_type
 		);
 	}
 
@@ -5902,7 +5926,7 @@ function wp_check_for_changed_slugs( $post_id, $post, $post_before ) {
  */
 function wp_check_for_changed_dates( $post_id, $post, $post_before ) {
 	$previous_date = date( 'Y-m-d', strtotime( $post_before->post_date ) );
-	$new_date = date( 'Y-m-d', strtotime( $post->post_date ) );
+	$new_date      = date( 'Y-m-d', strtotime( $post->post_date ) );
 	// Don't bother if it hasn't changed.
 	if ( $new_date == $previous_date ) {
 		return;
diff --git a/wp-includes/query.php b/wp-includes/query.php
index ced8e40548..9d2db7408e 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1037,13 +1037,13 @@ function _find_post_by_old_slug( $post_type ) {
 	// if year, monthnum, or day have been specified, make our query more precise
 	// just in case there are multiple identical _wp_old_slug values
 	if ( get_query_var( 'year' ) ) {
-		$query .= $wpdb->prepare( " AND YEAR(post_date) = %d", get_query_var( 'year' ) );
+		$query .= $wpdb->prepare( ' AND YEAR(post_date) = %d', get_query_var( 'year' ) );
 	}
 	if ( get_query_var( 'monthnum' ) ) {
-		$query .= $wpdb->prepare( " AND MONTH(post_date) = %d", get_query_var( 'monthnum' ) );
+		$query .= $wpdb->prepare( ' AND MONTH(post_date) = %d', get_query_var( 'monthnum' ) );
 	}
 	if ( get_query_var( 'day' ) ) {
-		$query .= $wpdb->prepare( " AND DAYOFMONTH(post_date) = %d", get_query_var( 'day' ) );
+		$query .= $wpdb->prepare( ' AND DAYOFMONTH(post_date) = %d', get_query_var( 'day' ) );
 	}
 
 	$id = (int) $wpdb->get_var( $query );
@@ -1069,13 +1069,13 @@ function _find_post_by_old_date( $post_type ) {
 
 	$date_query = '';
 	if ( get_query_var( 'year' ) ) {
-		$date_query .= $wpdb->prepare( " AND YEAR(pm_date.meta_value) = %d", get_query_var( 'year' ) );
+		$date_query .= $wpdb->prepare( ' AND YEAR(pm_date.meta_value) = %d', get_query_var( 'year' ) );
 	}
 	if ( get_query_var( 'monthnum' ) ) {
-		$date_query .= $wpdb->prepare( " AND MONTH(pm_date.meta_value) = %d", get_query_var( 'monthnum' ) );
+		$date_query .= $wpdb->prepare( ' AND MONTH(pm_date.meta_value) = %d', get_query_var( 'monthnum' ) );
 	}
 	if ( get_query_var( 'day' ) ) {
-		$date_query .= $wpdb->prepare( " AND DAYOFMONTH(pm_date.meta_value) = %d", get_query_var( 'day' ) );
+		$date_query .= $wpdb->prepare( ' AND DAYOFMONTH(pm_date.meta_value) = %d', get_query_var( 'day' ) );
 	}
 
 	$id = 0;
diff --git a/wp-includes/rest-api/class-wp-rest-request.php b/wp-includes/rest-api/class-wp-rest-request.php
index f4981e974d..26c1c0fb45 100644
--- a/wp-includes/rest-api/class-wp-rest-request.php
+++ b/wp-includes/rest-api/class-wp-rest-request.php
@@ -802,7 +802,9 @@ class WP_REST_Request implements ArrayAccess {
 
 		if ( $invalid_params ) {
 			return new WP_Error(
-				'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array(
+				'rest_invalid_param',
+				sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ),
+				array(
 					'status' => 400,
 					'params' => $invalid_params,
 				)
@@ -845,7 +847,9 @@ class WP_REST_Request implements ArrayAccess {
 
 		if ( ! empty( $required ) ) {
 			return new WP_Error(
-				'rest_missing_callback_param', sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array(
+				'rest_missing_callback_param',
+				sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ),
+				array(
 					'status' => 400,
 					'params' => $required,
 				)
@@ -878,7 +882,9 @@ class WP_REST_Request implements ArrayAccess {
 
 		if ( $invalid_params ) {
 			return new WP_Error(
-				'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array(
+				'rest_invalid_param',
+				sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ),
+				array(
 					'status' => 400,
 					'params' => $invalid_params,
 				)
diff --git a/wp-includes/rest-api/class-wp-rest-server.php b/wp-includes/rest-api/class-wp-rest-server.php
index d758a3b128..d18bc5187d 100644
--- a/wp-includes/rest-api/class-wp-rest-server.php
+++ b/wp-includes/rest-api/class-wp-rest-server.php
@@ -265,7 +265,10 @@ class WP_REST_Server {
 		 * @param bool $rest_enabled Whether the REST API is enabled. Default true.
 		 */
 		apply_filters_deprecated(
-			'rest_enabled', array( true ), '4.7.0', 'rest_authentication_errors',
+			'rest_enabled',
+			array( true ),
+			'4.7.0',
+			'rest_authentication_errors',
 			__( 'The REST API can no longer be completely disabled, the rest_authentication_errors filter can be used to restrict access to the API, instead.' )
 		);
 
@@ -656,7 +659,9 @@ class WP_REST_Server {
 			$this->namespaces[ $namespace ] = array();
 
 			$this->register_route(
-				$namespace, '/' . $namespace, array(
+				$namespace,
+				'/' . $namespace,
+				array(
 					array(
 						'methods'  => self::READABLE,
 						'callback' => array( $this, 'get_namespace_index' ),
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
index 021c43c84a..05227a1d5f 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
@@ -44,7 +44,9 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	public function register_routes() {
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base, array(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_items' ),
@@ -62,7 +64,9 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 		);
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<id>[\d]+)',
+			array(
 				'args'   => array(
 					'id' => array(
 						'description' => __( 'Unique identifier for the object.' ),
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
index 1b9c427946..1b73881e96 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
@@ -586,7 +586,8 @@ abstract class WP_REST_Controller {
 				// Only use required / default from arg_options on CREATABLE endpoints.
 				if ( WP_REST_Server::CREATABLE !== $method ) {
 					$params['arg_options'] = array_diff_key(
-						$params['arg_options'], array(
+						$params['arg_options'],
+						array(
 							'required' => '',
 							'default'  => '',
 						)
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
index 57d41e4795..699e8fd2ce 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
@@ -36,7 +36,9 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	public function register_routes() {
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base, array(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_items' ),
@@ -48,7 +50,9 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 		);
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base . '/(?P<status>[\w-]+)', array(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<status>[\w-]+)',
+			array(
 				'args'   => array(
 					'status' => array(
 						'description' => __( 'An alphanumeric identifier for the status.' ),
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
index fda0aca360..c718a3dfa6 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
@@ -36,7 +36,9 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	public function register_routes() {
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base, array(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_items' ),
@@ -48,7 +50,9 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 		);
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base . '/(?P<type>[\w-]+)', array(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<type>[\w-]+)',
+			array(
 				'args'   => array(
 					'type' => array(
 						'description' => __( 'An alphanumeric identifier for the post type.' ),
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
index c1cc4be2c4..040f0ed7f9 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
@@ -58,7 +58,9 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	public function register_routes() {
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base, array(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_items' ),
@@ -86,7 +88,9 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 			);
 		}
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<id>[\d]+)',
+			array(
 				'args'   => array(
 					'id' => array(
 						'description' => __( 'Unique identifier for the object.' ),
@@ -1691,7 +1695,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 					'id'   => $last_revision,
 				);
 			}
-
 		}
 
 		$post_type_obj = get_post_type_object( $post->post_type );
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
index 60a1910278..fd4a03152a 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
@@ -66,7 +66,9 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	public function register_routes() {
 
 		register_rest_route(
-			$this->namespace, '/' . $this->parent_base . '/(?P<parent>[\d]+)/' . $this->rest_base, array(
+			$this->namespace,
+			'/' . $this->parent_base . '/(?P<parent>[\d]+)/' . $this->rest_base,
+			array(
 				'args'   => array(
 					'parent' => array(
 						'description' => __( 'The ID for the parent of the object.' ),
@@ -84,7 +86,9 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 		);
 
 		register_rest_route(
-			$this->namespace, '/' . $this->parent_base . '/(?P<parent>[\d]+)/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			$this->namespace,
+			'/' . $this->parent_base . '/(?P<parent>[\d]+)/' . $this->rest_base . '/(?P<id>[\d]+)',
+			array(
 				'args'   => array(
 					'parent' => array(
 						'description' => __( 'The ID for the parent of the object.' ),
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php
index 1a38261a08..95752f8236 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php
@@ -36,7 +36,9 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	public function register_routes() {
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base, array(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_item' ),
@@ -187,7 +189,9 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 				 */
 				if ( is_wp_error( rest_validate_value_from_schema( get_option( $args['option_name'], false ), $args['schema'] ) ) ) {
 					return new WP_Error(
-						'rest_invalid_stored_value', sprintf( __( 'The %s property has an invalid stored value, and cannot be updated to null.' ), $name ), array( 'status' => 500 )
+						'rest_invalid_stored_value',
+						sprintf( __( 'The %s property has an invalid stored value, and cannot be updated to null.' ), $name ),
+						array( 'status' => 500 )
 					);
 				}
 
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
index 32c543ce19..6dc78cb6d0 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
@@ -36,7 +36,9 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	public function register_routes() {
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base, array(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_items' ),
@@ -48,7 +50,9 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 		);
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base . '/(?P<taxonomy>[\w-]+)', array(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<taxonomy>[\w-]+)',
+			array(
 				'args'   => array(
 					'taxonomy' => array(
 						'description' => __( 'An alphanumeric identifier for the taxonomy.' ),
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
index af806b812f..3cb97f9616 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
@@ -74,7 +74,9 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	public function register_routes() {
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base, array(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_items' ),
@@ -92,7 +94,9 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 		);
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<id>[\d]+)',
+			array(
 				'args'   => array(
 					'id' => array(
 						'description' => __( 'Unique identifier for the term.' ),
@@ -422,7 +426,12 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 			if ( $term_id = $term->get_error_data( 'term_exists' ) ) {
 				$existing_term = get_term( $term_id, $this->taxonomy );
 				$term->add_data( $existing_term->term_id, 'term_exists' );
-				$term->add_data( array( 'status' => 400, 'term_id' => $term_id ) );
+				$term->add_data(
+					array(
+						'status'  => 400,
+						'term_id' => $term_id,
+					)
+				);
 			}
 
 			return $term;
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
index a9aff62651..ec3f9ea204 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
@@ -46,7 +46,9 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	public function register_routes() {
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base, array(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_items' ),
@@ -64,7 +66,9 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 		);
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<id>[\d]+)',
+			array(
 				'args'   => array(
 					'id' => array(
 						'description' => __( 'Unique identifier for the user.' ),
@@ -108,7 +112,9 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 		);
 
 		register_rest_route(
-			$this->namespace, '/' . $this->rest_base . '/me', array(
+			$this->namespace,
+			'/' . $this->rest_base . '/me',
+			array(
 				array(
 					'methods'  => WP_REST_Server::READABLE,
 					'callback' => array( $this, 'get_current_item' ),
@@ -194,7 +200,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 
 		if ( 'authors' === $request['who'] ) {
 			$can_view = false;
-			$types = get_post_types( array( 'show_in_rest' => true ), 'objects' );
+			$types    = get_post_types( array( 'show_in_rest' => true ), 'objects' );
 			foreach ( $types as $type ) {
 				if ( post_type_supports( $type->name, 'author' )
 					&& current_user_can( $type->cap->edit_posts ) ) {
diff --git a/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php b/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php
index e2fb0e1632..059f78c6e8 100644
--- a/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php
+++ b/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php
@@ -53,7 +53,9 @@ abstract class WP_REST_Meta_Fields {
 	 */
 	public function register_field() {
 		register_rest_field(
-			$this->get_rest_field_type(), 'meta', array(
+			$this->get_rest_field_type(),
+			'meta',
+			array(
 				'get_callback'    => array( $this, 'get_value' ),
 				'update_callback' => array( $this, 'update_value' ),
 				'schema'          => $this->get_field_schema(),
diff --git a/wp-includes/revision.php b/wp-includes/revision.php
index bc95631fb6..3bf3171379 100644
--- a/wp-includes/revision.php
+++ b/wp-includes/revision.php
@@ -474,7 +474,8 @@ function wp_get_post_revisions( $post_id = 0, $args = null ) {
 	}
 
 	$args = array_merge(
-		$args, array(
+		$args,
+		array(
 			'post_parent' => $post->ID,
 			'post_type'   => 'revision',
 			'post_status' => 'inherit',
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 9e4742b6f5..226627ecb0 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -69,7 +69,9 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" );
 	did_action( 'init' ) && $scripts->localize(
-		'utils', 'userSettings', array(
+		'utils',
+		'userSettings',
+		array(
 			'url'    => (string) SITECOOKIEPATH,
 			'uid'    => (string) get_current_user_id(),
 			'time'   => (string) time(),
@@ -79,7 +81,9 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array( 'jquery', 'hoverIntent', 'utils' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'common', 'commonL10n', array(
+		'common',
+		'commonL10n',
+		array(
 			'warnDelete'   => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
 			'dismiss'      => __( 'Dismiss this notice.' ),
 			'collapseMenu' => __( 'Collapse Main menu' ),
@@ -93,7 +97,9 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'quicktags', 'quicktagsL10n', array(
+		'quicktags',
+		'quicktagsL10n',
+		array(
 			'closeAllOpenTags'      => __( 'Close all open tags' ),
 			'closeTags'             => __( 'close tags' ),
 			'enterURL'              => __( 'Enter the URL' ),
@@ -135,7 +141,9 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array( 'jquery' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'wp-ajax-response', 'wpAjax', array(
+		'wp-ajax-response',
+		'wpAjax',
+		array(
 			'noPerm' => __( 'Sorry, you are not allowed to do that.' ),
 			'broken' => __( 'Something went wrong.' ),
 		)
@@ -144,7 +152,9 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'wp-api-request', "/wp-includes/js/api-request$suffix.js", array( 'jquery' ), false, 1 );
 	// `wpApiSettings` is also used by `wp-api`, which depends on this script.
 	did_action( 'init' ) && $scripts->localize(
-		'wp-api-request', 'wpApiSettings', array(
+		'wp-api-request',
+		'wpApiSettings',
+		array(
 			'root'          => esc_url_raw( get_rest_url() ),
 			'nonce'         => ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' ),
 			'versionString' => 'wp/v2/',
@@ -153,7 +163,9 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array( 'jquery-ui-widget', 'jquery-ui-position' ), '20111129a', 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'wp-pointer', 'wpPointerL10n', array(
+		'wp-pointer',
+		'wpPointerL10n',
+		array(
 			'dismiss' => __( 'Dismiss' ),
 		)
 	);
@@ -162,7 +174,8 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array( 'jquery' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'heartbeat', 'heartbeatSettings',
+		'heartbeat',
+		'heartbeatSettings',
 		/**
 		 * Filters the Heartbeat settings.
 		 *
@@ -175,7 +188,9 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'wp-auth-check', "/wp-includes/js/wp-auth-check$suffix.js", array( 'heartbeat' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'wp-auth-check', 'authcheckL10n', array(
+		'wp-auth-check',
+		'authcheckL10n',
+		array(
 			'beforeunload' => __( 'Your session has expired. You can log in again from this page or go to the login page.' ),
 
 			/**
@@ -254,7 +269,9 @@ function wp_default_scripts( &$scripts ) {
 
 	// Strings for 'jquery-ui-autocomplete' live region messages
 	did_action( 'init' ) && $scripts->localize(
-		'jquery-ui-autocomplete', 'uiAutocompleteL10n', array(
+		'jquery-ui-autocomplete',
+		'uiAutocompleteL10n',
+		array(
 			'noResults'    => __( 'No results found.' ),
 			/* translators: Number of results found when using jQuery UI Autocomplete */
 			'oneResult'    => __( '1 result found. Use up and down arrow keys to navigate.' ),
@@ -287,7 +304,9 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array( 'jquery' ), '3.1-20121105', 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'thickbox', 'thickboxL10n', array(
+		'thickbox',
+		'thickboxL10n',
+		array(
 			'next'             => __( 'Next &gt;' ),
 			'prev'             => __( '&lt; Prev' ),
 			'image'            => __( 'Image' ),
@@ -358,7 +377,9 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array( 'underscore', 'jquery' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'wp-util', '_wpUtilSettings', array(
+		'wp-util',
+		'_wpUtilSettings',
+		array(
 			'ajax' => array(
 				'url' => admin_url( 'admin-ajax.php', 'relative' ),
 			),
@@ -378,8 +399,10 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'mediaelement-migrate', "/wp-includes/js/mediaelement/mediaelement-migrate$suffix.js", array(), false, 1 );
 
 	did_action( 'init' ) && $scripts->add_inline_script(
-		'mediaelement-core', sprintf(
-			'var mejsL10n = %s;', wp_json_encode(
+		'mediaelement-core',
+		sprintf(
+			'var mejsL10n = %s;',
+			wp_json_encode(
 				array(
 					'language' => strtolower( strtok( is_admin() ? get_user_locale() : get_locale(), '_-' ) ),
 					'strings'  => array(
@@ -467,7 +490,8 @@ function wp_default_scripts( &$scripts ) {
 					),
 				)
 			)
-		), 'before'
+		),
+		'before'
 	);
 
 	$scripts->add( 'mediaelement-vimeo', '/wp-includes/js/mediaelement/renderers/vimeo.min.js', array( 'mediaelement' ), '4.2.6-78496d1', 1 );
@@ -478,7 +502,8 @@ function wp_default_scripts( &$scripts ) {
 		'stretching'  => 'responsive',
 	);
 	did_action( 'init' ) && $scripts->localize(
-		'mediaelement', '_wpmejsSettings',
+		'mediaelement',
+		'_wpmejsSettings',
 		/**
 		 * Filters the MediaElement configuration settings.
 		 *
@@ -499,8 +524,10 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'code-editor', "/wp-admin/js/code-editor$suffix.js", array( 'jquery', 'wp-codemirror', 'underscore' ) );
 	$scripts->add( 'wp-theme-plugin-editor', "/wp-admin/js/theme-plugin-editor$suffix.js", array( 'wp-util', 'wp-sanitize', 'jquery', 'jquery-ui-core', 'wp-a11y', 'underscore' ) );
 	did_action( 'init' ) && $scripts->add_inline_script(
-		'wp-theme-plugin-editor', sprintf(
-			'wp.themePluginEditor.l10n = %s;', wp_json_encode(
+		'wp-theme-plugin-editor',
+		sprintf(
+			'wp.themePluginEditor.l10n = %s;',
+			wp_json_encode(
 				array(
 					'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
 					'saveError' => __( 'Something went wrong. Your change may not have been saved. Please try again. There is also a chance that you may need to manually fix and upload the file over FTP.' ),
@@ -519,14 +546,18 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' );
 	did_action( 'init' ) && $scripts->localize(
-		'zxcvbn-async', '_zxcvbnSettings', array(
+		'zxcvbn-async',
+		'_zxcvbnSettings',
+		array(
 			'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js',
 		)
 	);
 
 	$scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'password-strength-meter', 'pwsL10n', array(
+		'password-strength-meter',
+		'pwsL10n',
+		array(
 			'unknown'  => _x( 'Password strength unknown', 'password strength' ),
 			'short'    => _x( 'Very weak', 'password strength' ),
 			'bad'      => _x( 'Weak', 'password strength' ),
@@ -538,7 +569,9 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'user-profile', 'userProfileL10n', array(
+		'user-profile',
+		'userProfileL10n',
+		array(
 			'warn'     => __( 'Your new password has not been saved.' ),
 			'warnWeak' => __( 'Confirm use of weak password' ),
 			'show'     => __( 'Show' ),
@@ -557,7 +590,9 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'wplink', 'wpLinkL10n', array(
+		'wplink',
+		'wpLinkL10n',
+		array(
 			'title'          => __( 'Insert/edit link' ),
 			'update'         => __( 'Update' ),
 			'save'           => __( 'Add Link' ),
@@ -583,7 +618,9 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'customize-views', '/wp-includes/js/customize-views.js', array( 'jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views' ), false, 1 );
 	$scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base', 'wp-a11y', 'wp-util', 'jquery-ui-core' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'customize-controls', '_wpCustomizeControlsL10n', array(
+		'customize-controls',
+		'_wpCustomizeControlsL10n',
+		array(
 			'activate'                => __( 'Activate &amp; Publish' ),
 			'save'                    => __( 'Save &amp; Publish' ), // @todo Remove as not required.
 			'publish'                 => __( 'Publish' ),
@@ -662,7 +699,9 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
 	$scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'wp-backbone' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
-		'media-models', '_wpMediaModelsL10n', array(
+		'media-models',
+		'_wpMediaModelsL10n',
+		array(
 			'settings' => array(
 				'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
 				'post'    => array( 'id' => 0 ),
@@ -684,7 +723,9 @@ function wp_default_scripts( &$scripts ) {
 	if ( is_admin() ) {
 		$scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'admin-tags', 'tagsl10n', array(
+			'admin-tags',
+			'tagsl10n',
+			array(
 				'noPerm' => __( 'Sorry, you are not allowed to do that.' ),
 				'broken' => __( 'Something went wrong.' ),
 			)
@@ -692,7 +733,9 @@ function wp_default_scripts( &$scripts ) {
 
 		$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array( 'wp-lists', 'quicktags', 'jquery-query' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'admin-comments', 'adminCommentsL10n', array(
+			'admin-comments',
+			'adminCommentsL10n',
+			array(
 				'hotkeys_highlight_first' => isset( $_GET['hotkeys_highlight_first'] ),
 				'hotkeys_highlight_last'  => isset( $_GET['hotkeys_highlight_last'] ),
 				'replyApprove'            => __( 'Approve and Reply' ),
@@ -707,7 +750,9 @@ function wp_default_scripts( &$scripts ) {
 
 		$scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array( 'jquery' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'xfn', 'privacyToolsL10n', array(
+			'xfn',
+			'privacyToolsL10n',
+			array(
 				'noDataFound'     => __( 'No personal data was found for this user.' ),
 				'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
 				'noneRemoved'     => __( 'Personal data was found for this user but was not erased.' ),
@@ -720,7 +765,9 @@ function wp_default_scripts( &$scripts ) {
 
 		$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array( 'jquery-ui-sortable' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'postbox', 'postBoxL10n', array(
+			'postbox',
+			'postBoxL10n',
+			array(
 				'postBoxEmptyString' => __( 'Drag boxes here' ),
 			)
 		);
@@ -729,7 +776,9 @@ function wp_default_scripts( &$scripts ) {
 
 		$scripts->add( 'tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array( 'jquery-ui-autocomplete', 'wp-a11y' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'tags-suggest', 'tagsSuggestL10n', array(
+			'tags-suggest',
+			'tagsSuggestL10n',
+			array(
 				'tagDelimiter' => _x( ',', 'tag delimiter' ),
 				'removeTerm'   => __( 'Remove term:' ),
 				'termSelected' => __( 'Term selected.' ),
@@ -751,7 +800,9 @@ function wp_default_scripts( &$scripts ) {
 
 		$scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'post', 'postL10n', array(
+			'post',
+			'postL10n',
+			array(
 				'ok'                 => __( 'OK' ),
 				'cancel'             => __( 'Cancel' ),
 				'publishOn'          => __( 'Publish on:' ),
@@ -785,7 +836,9 @@ function wp_default_scripts( &$scripts ) {
 		$scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) );
 		$scripts->add_data( 'comment', 'group', 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'comment', 'commentL10n', array(
+			'comment',
+			'commentL10n',
+			array(
 				'submittedOn' => __( 'Submitted on:' ),
 				/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
 				'dateFormat'  => __( '%1$s %2$s, %3$s @ %4$s:%5$s' ),
@@ -796,8 +849,10 @@ function wp_default_scripts( &$scripts ) {
 
 		$scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-a11y' ), false, 1 );
 		did_action( 'init' ) && $scripts->add_inline_script(
-			'admin-widgets', sprintf(
-				'wpWidgets.l10n = %s;', wp_json_encode(
+			'admin-widgets',
+			sprintf(
+				'wpWidgets.l10n = %s;',
+				wp_json_encode(
 					array(
 						'save'        => __( 'Save' ),
 						'saved'       => __( 'Saved' ),
@@ -822,7 +877,9 @@ function wp_default_scripts( &$scripts ) {
 
 		$scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'tags-suggest', 'wp-a11y' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'inline-edit-post', 'inlineEditL10n', array(
+			'inline-edit-post',
+			'inlineEditL10n',
+			array(
 				'error'      => __( 'Error while saving the changes.' ),
 				'ntdeltitle' => __( 'Remove From Bulk Edit' ),
 				'notitle'    => __( '(no title)' ),
@@ -833,7 +890,9 @@ function wp_default_scripts( &$scripts ) {
 
 		$scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'inline-edit-tax', 'inlineEditL10n', array(
+			'inline-edit-tax',
+			'inlineEditL10n',
+			array(
 				'error' => __( 'Error while saving the changes.' ),
 				'saved' => __( 'Changes saved.' ),
 			)
@@ -841,7 +900,9 @@ function wp_default_scripts( &$scripts ) {
 
 		$scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'plugin-install', 'plugininstallL10n', array(
+			'plugin-install',
+			'plugininstallL10n',
+			array(
 				'plugin_information' => __( 'Plugin:' ),
 				'plugin_modal_label' => __( 'Plugin details' ),
 				'ays'                => __( 'Are you sure you want to install this plugin?' ),
@@ -850,7 +911,9 @@ function wp_default_scripts( &$scripts ) {
 
 		$scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'updates', '_wpUpdatesSettings', array(
+			'updates',
+			'_wpUpdatesSettings',
+			array(
 				'ajax_nonce' => wp_create_nonce( 'updates' ),
 				'l10n'       => array(
 					/* translators: %s: Search string */
@@ -941,7 +1004,9 @@ function wp_default_scripts( &$scripts ) {
 		$scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 );
 		$scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'wp-color-picker', 'wpColorPickerL10n', array(
+			'wp-color-picker',
+			'wpColorPickerL10n',
+			array(
 				'clear'            => __( 'Clear' ),
 				'clearAriaLabel'   => __( 'Clear color' ),
 				'defaultString'    => __( 'Default' ),
@@ -958,21 +1023,27 @@ function wp_default_scripts( &$scripts ) {
 		$scripts->add( 'media-grid', "/wp-includes/js/media-grid$suffix.js", array( 'media-editor' ), false, 1 );
 		$scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'media', 'attachMediaBoxL10n', array(
+			'media',
+			'attachMediaBoxL10n',
+			array(
 				'error' => __( 'An error has occurred. Please reload the page and try again.' ),
 			)
 		);
 
 		$scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array( 'jquery', 'json2', 'imgareaselect' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'image-edit', 'imageEditL10n', array(
+			'image-edit',
+			'imageEditL10n',
+			array(
 				'error' => __( 'Could not load the preview image. Please reload the page and try again.' ),
 			)
 		);
 
 		$scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 );
 		did_action( 'init' ) && $scripts->localize(
-			'set-post-thumbnail', 'setPostThumbnailL10n', array(
+			'set-post-thumbnail',
+			'setPostThumbnailL10n',
+			array(
 				'setThumbnail' => __( 'Use as featured image' ),
 				'saving'       => __( 'Saving...' ), // no ellipsis
 				'error'        => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
@@ -983,7 +1054,9 @@ function wp_default_scripts( &$scripts ) {
 		// Navigation Menus
 		$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2' ) );
 		did_action( 'init' ) && $scripts->localize(
-			'nav-menu', 'navMenuL10n', array(
+			'nav-menu',
+			'navMenuL10n',
+			array(
 				'noResultsFound' => __( 'No results found.' ),
 				'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
 				'saveAlert'      => __( 'The changes you made will be lost if you navigate away from this page.' ),
@@ -1204,20 +1277,26 @@ function wp_prototype_before_jquery( $js_array ) {
 function wp_just_in_time_script_localization() {
 
 	wp_localize_script(
-		'autosave', 'autosaveL10n', array(
+		'autosave',
+		'autosaveL10n',
+		array(
 			'autosaveInterval' => AUTOSAVE_INTERVAL,
 			'blog_id'          => get_current_blog_id(),
 		)
 	);
 
 	wp_localize_script(
-		'mce-view', 'mceViewL10n', array(
+		'mce-view',
+		'mceViewL10n',
+		array(
 			'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array(),
 		)
 	);
 
 	wp_localize_script(
-		'word-count', 'wordCountL10n', array(
+		'word-count',
+		'wordCountL10n',
+		array(
 			/*
 			 * translators: If your word count is based on single characters (e.g. East Asian characters),
 			 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
@@ -1326,7 +1405,9 @@ function wp_localize_community_events() {
 	$events_client = new WP_Community_Events( $user_id, $saved_location );
 
 	wp_localize_script(
-		'dashboard', 'communityEventsData', array(
+		'dashboard',
+		'communityEventsData',
+		array(
 			'nonce' => wp_create_nonce( 'community_events' ),
 			'cache' => $events_client->get_cached_events(),
 
diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 00c57947be..427da60336 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -58,7 +58,9 @@ function create_initial_taxonomies() {
 	}
 
 	register_taxonomy(
-		'category', 'post', array(
+		'category',
+		'post',
+		array(
 			'hierarchical'          => true,
 			'query_var'             => 'category_name',
 			'rewrite'               => $rewrite['category'],
@@ -79,7 +81,9 @@ function create_initial_taxonomies() {
 	);
 
 	register_taxonomy(
-		'post_tag', 'post', array(
+		'post_tag',
+		'post',
+		array(
 			'hierarchical'          => false,
 			'query_var'             => 'tag',
 			'rewrite'               => $rewrite['post_tag'],
@@ -100,7 +104,9 @@ function create_initial_taxonomies() {
 	);
 
 	register_taxonomy(
-		'nav_menu', 'nav_menu_item', array(
+		'nav_menu',
+		'nav_menu_item',
+		array(
 			'public'            => false,
 			'hierarchical'      => false,
 			'labels'            => array(
@@ -116,7 +122,9 @@ function create_initial_taxonomies() {
 	);
 
 	register_taxonomy(
-		'link_category', 'link', array(
+		'link_category',
+		'link',
+		array(
 			'hierarchical' => false,
 			'labels'       => array(
 				'name'                       => __( 'Link Categories' ),
@@ -148,7 +156,9 @@ function create_initial_taxonomies() {
 	);
 
 	register_taxonomy(
-		'post_format', 'post', array(
+		'post_format',
+		'post',
+		array(
 			'public'            => true,
 			'hierarchical'      => false,
 			'labels'            => array(
@@ -1867,7 +1877,9 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
 
 	foreach ( $object_ids as $object_id ) {
 		$terms = wp_get_object_terms(
-			$object_id, $taxonomy, array(
+			$object_id,
+			$taxonomy,
+			array(
 				'fields'  => 'ids',
 				'orderby' => 'none',
 			)
@@ -2200,7 +2212,9 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 			$term_group = $wpdb->get_var( "SELECT MAX(term_group) FROM $wpdb->terms" ) + 1;
 
 			wp_update_term(
-				$alias->term_id, $taxonomy, array(
+				$alias->term_id,
+				$taxonomy,
+				array(
 					'term_group' => $term_group,
 				)
 			);
@@ -2212,7 +2226,8 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 	 * unless a unique slug has been explicitly provided.
 	 */
 	$name_matches = get_terms(
-		$taxonomy, array(
+		$taxonomy,
+		array(
 			'name'                   => $name,
 			'hide_empty'             => false,
 			'parent'                 => $args['parent'],
@@ -2239,7 +2254,8 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 		if ( ! $slug_provided || $name_match->slug === $slug || $slug_match ) {
 			if ( is_taxonomy_hierarchical( $taxonomy ) ) {
 				$siblings = get_terms(
-					$taxonomy, array(
+					$taxonomy,
+					array(
 						'get'                    => 'all',
 						'parent'                 => $parent,
 						'update_term_meta_cache' => false,
@@ -2450,7 +2466,9 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
 
 	if ( ! $append ) {
 		$old_tt_ids = wp_get_object_terms(
-			$object_id, $taxonomy, array(
+			$object_id,
+			$taxonomy,
+			array(
 				'fields'                 => 'tt_ids',
 				'orderby'                => 'none',
 				'update_term_meta_cache' => false,
@@ -2499,7 +2517,8 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
 		 */
 		do_action( 'add_term_relationship', $object_id, $tt_id, $taxonomy );
 		$wpdb->insert(
-			$wpdb->term_relationships, array(
+			$wpdb->term_relationships,
+			array(
 				'object_id'        => $object_id,
 				'term_taxonomy_id' => $tt_id,
 			)
@@ -2890,7 +2909,9 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 			$term_group = $wpdb->get_var( "SELECT MAX(term_group) FROM $wpdb->terms" ) + 1;
 
 			wp_update_term(
-				$alias->term_id, $taxonomy, array(
+				$alias->term_id,
+				$taxonomy,
+				array(
 					'term_group' => $term_group,
 				)
 			);
@@ -3402,7 +3423,9 @@ function update_object_term_cache( $object_ids, $object_type ) {
 	}
 
 	$terms = wp_get_object_terms(
-		$ids, $taxonomies, array(
+		$ids,
+		$taxonomies,
+		array(
 			'fields'                 => 'all_with_object_id',
 			'orderby'                => 'name',
 			'update_term_meta_cache' => false,
@@ -3476,7 +3499,8 @@ function _get_term_hierarchy( $taxonomy ) {
 	}
 	$children = array();
 	$terms    = get_terms(
-		$taxonomy, array(
+		$taxonomy,
+		array(
 			'get'                    => 'all',
 			'orderby'                => 'id',
 			'fields'                 => 'id=>parent',
@@ -4326,7 +4350,8 @@ function get_the_taxonomies( $post = 0, $args = array() ) {
 	$post = get_post( $post );
 
 	$args = wp_parse_args(
-		$args, array(
+		$args,
+		array(
 			/* translators: %s: taxonomy label, %l: list of terms formatted as per $term_template */
 			'template'      => __( '%s: %l.' ),
 			'term_template' => '<a href="%1$s">%2$s</a>',
diff --git a/wp-includes/theme-compat/comments.php b/wp-includes/theme-compat/comments.php
index 0f2e901e66..b54321bc9c 100644
--- a/wp-includes/theme-compat/comments.php
+++ b/wp-includes/theme-compat/comments.php
@@ -39,7 +39,8 @@ if ( post_password_required() ) { ?>
 			/* translators: 1: number of comments, 2: post title */
 			printf(
 				_n( '%1$s response to %2$s', '%1$s responses to %2$s', get_comments_number() ),
-				number_format_i18n( get_comments_number() ), '&#8220;' . get_the_title() . '&#8221;'
+				number_format_i18n( get_comments_number() ),
+				'&#8220;' . get_the_title() . '&#8221;'
 			);
 		}
 		?>
diff --git a/wp-includes/theme-compat/embed-content.php b/wp-includes/theme-compat/embed-content.php
index bdb38339ad..25a45f2cfe 100644
--- a/wp-includes/theme-compat/embed-content.php
+++ b/wp-includes/theme-compat/embed-content.php
@@ -76,7 +76,7 @@
 		}
 
 		if ( $thumbnail_id && 'rectangular' === $shape ) :
-		?>
+			?>
 			<div class="wp-embed-featured-image rectangular">
 				<a href="<?php the_permalink(); ?>" target="_top">
 					<?php echo wp_get_attachment_image( $thumbnail_id, $image_size ); ?>
diff --git a/wp-includes/theme-compat/header.php b/wp-includes/theme-compat/header.php
index cd92145e29..62f2018e57 100644
--- a/wp-includes/theme-compat/header.php
+++ b/wp-includes/theme-compat/header.php
@@ -29,10 +29,10 @@ _deprecated_file(
 <?php if ( file_exists( get_stylesheet_directory() . '/images/kubrickbgwide.jpg' ) ) { ?>
 <style type="text/css" media="screen">
 
-<?php
-// Checks to see whether it needs a sidebar
-if ( empty( $withcomments ) && ! is_single() ) {
-?>
+	<?php
+	// Checks to see whether it needs a sidebar
+	if ( empty( $withcomments ) && ! is_single() ) {
+		?>
 	#page { background: url("<?php bloginfo( 'stylesheet_directory' ); ?>/images/kubrickbg-<?php bloginfo( 'text_direction' ); ?>.jpg") repeat-y top; border: none; }
 <?php } else { // No sidebar ?>
 	#page { background: url("<?php bloginfo( 'stylesheet_directory' ); ?>/images/kubrickbgwide.jpg") repeat-y top; border: none; }
diff --git a/wp-includes/theme-compat/sidebar.php b/wp-includes/theme-compat/sidebar.php
index 45ef03d1b6..d8d3488e5b 100644
--- a/wp-includes/theme-compat/sidebar.php
+++ b/wp-includes/theme-compat/sidebar.php
@@ -20,7 +20,7 @@ _deprecated_file(
 			<?php
 			  /* Widgetized sidebar, if you have the plugin installed. */
 			if ( ! function_exists( 'dynamic_sidebar' ) || ! dynamic_sidebar() ) :
-					?>
+				?>
 			<li>
 				<?php get_search_form(); ?>
 			</li>
@@ -31,13 +31,13 @@ _deprecated_file(
 			</li>
 			-->
 
-			<?php
-			if ( is_404() || is_category() || is_day() || is_month() ||
+				<?php
+				if ( is_404() || is_category() || is_day() || is_month() ||
 				is_year() || is_search() || is_paged() ) :
-			?>
+					?>
 			 <li>
 
-			<?php if ( is_404() ) : /* If this is a 404 page */ ?>
+					<?php if ( is_404() ) : /* If this is a 404 page */ ?>
 			<?php elseif ( is_category() ) : /* If this is a category archive */ ?>
 				<p>
 				<?php
@@ -111,10 +111,10 @@ _deprecated_file(
 			<?php endif; ?>
 
 			</li>
-		<?php endif; ?>
+			<?php endif; ?>
 		</ul>
 		<ul role="navigation">
-			<?php wp_list_pages( 'title_li=<h2>' . __( 'Pages' ) . '</h2>' ); ?>
+				<?php wp_list_pages( 'title_li=<h2>' . __( 'Pages' ) . '</h2>' ); ?>
 
 			<li><h2><?php _e( 'Archives' ); ?></h2>
 				<ul>
@@ -122,18 +122,18 @@ _deprecated_file(
 				</ul>
 			</li>
 
-			<?php
-			wp_list_categories(
-				array(
-					'show_count' => 1,
-					'title_li'   => '<h2>' . __( 'Categories' ) . '</h2>',
-				)
-			);
-?>
+				<?php
+				wp_list_categories(
+					array(
+						'show_count' => 1,
+						'title_li'   => '<h2>' . __( 'Categories' ) . '</h2>',
+					)
+				);
+				?>
 		</ul>
 		<ul>
-			<?php if ( is_home() || is_page() ) { /* If this is the frontpage */ ?>
-				<?php wp_list_bookmarks(); ?>
+				<?php if ( is_home() || is_page() ) { /* If this is the frontpage */ ?>
+					<?php wp_list_bookmarks(); ?>
 
 				<li><h2><?php _e( 'Meta' ); ?></h2>
 				<ul>
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 4e4edd838e..3d26800436 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -725,7 +725,8 @@ function switch_theme( $stylesheet ) {
 
 	if ( is_array( $_sidebars_widgets ) ) {
 		set_theme_mod(
-			'sidebars_widgets', array(
+			'sidebars_widgets',
+			array(
 				'time' => time(),
 				'data' => $_sidebars_widgets,
 			)
@@ -1677,11 +1678,11 @@ function _custom_background_cb() {
 
 		$style .= $image . $position . $size . $repeat . $attachment;
 	}
-?>
+	?>
 <style type="text/css" id="custom-background-css">
 body.custom-background { <?php echo trim( $style ); ?> }
 </style>
-<?php
+	<?php
 }
 
 /**
@@ -1692,11 +1693,11 @@ body.custom-background { <?php echo trim( $style ); ?> }
 function wp_custom_css_cb() {
 	$styles = wp_get_custom_css();
 	if ( $styles || is_customize_preview() ) :
-	?>
+		?>
 		<style type="text/css" id="wp-custom-css">
 			<?php echo strip_tags( $styles ); // Note that esc_html() cannot be used because `div &gt; span` is not interpreted properly. ?>
 		</style>
-	<?php
+		<?php
 	endif;
 }
 
@@ -1802,7 +1803,8 @@ function wp_get_custom_css( $stylesheet = '' ) {
  */
 function wp_update_custom_css_post( $css, $args = array() ) {
 	$args = wp_parse_args(
-		$args, array(
+		$args,
+		array(
 			'preprocessed' => '',
 			'stylesheet'   => get_stylesheet(),
 		)
@@ -2021,7 +2023,8 @@ function get_theme_starter_content() {
 				array(
 					'title'  => _x( 'Find Us', 'Theme starter content' ),
 					'text'   => join(
-						'', array(
+						'',
+						array(
 							'<strong>' . _x( 'Address', 'Theme starter content' ) . "</strong>\n",
 							_x( '123 Main Street', 'Theme starter content' ) . "\n" . _x( 'New York, NY 10001', 'Theme starter content' ) . "\n\n",
 							'<strong>' . _x( 'Hours', 'Theme starter content' ) . "</strong>\n",
@@ -2539,10 +2542,13 @@ function add_theme_support( $feature ) {
 			if ( did_action( 'wp_loaded' ) ) {
 				/* translators: 1: title-tag, 2: wp_loaded */
 				_doing_it_wrong(
-					"add_theme_support( 'title-tag' )", sprintf(
+					"add_theme_support( 'title-tag' )",
+					sprintf(
 						__( 'Theme support for %1$s should be registered before the %2$s hook.' ),
-						'<code>title-tag</code>', '<code>wp_loaded</code>'
-					), '4.1.0'
+						'<code>title-tag</code>',
+						'<code>wp_loaded</code>'
+					),
+					'4.1.0'
 				);
 
 				return false;
@@ -2613,7 +2619,7 @@ function _custom_logo_header_styles() {
 				clip: rect(1px, 1px, 1px, 1px);
 			}
 		</style>
-	<?php
+		<?php
 	}
 }
 
diff --git a/wp-includes/update.php b/wp-includes/update.php
index efb97002c0..7e6bb65421 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -189,7 +189,8 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 			}
 		}
 		$offer = (object) array_intersect_key(
-			$offer, array_fill_keys(
+			$offer,
+			array_fill_keys(
 				array(
 					'response',
 					'download',
@@ -204,7 +205,8 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 					'notify_email',
 					'support_email',
 					'new_files',
-				), ''
+				),
+				''
 			)
 		);
 	}
diff --git a/wp-includes/user.php b/wp-includes/user.php
index c1de6f1243..40f227c5d6 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -909,7 +909,8 @@ function count_users( $strategy = 'time', $site_id = null ) {
 			FROM {$wpdb->usermeta}
 			INNER JOIN {$wpdb->users} ON user_id = ID
 			WHERE meta_key = '{$blog_prefix}capabilities'
-		", ARRAY_N
+		",
+			ARRAY_N
 		);
 
 		// Run the previous loop again to associate results with role names.
@@ -2606,7 +2607,8 @@ function wp_get_users_with_no_role( $site_id = null ) {
 		FROM $wpdb->usermeta
 		WHERE meta_key = '{$prefix}capabilities'
 		AND meta_value NOT REGEXP %s
-	", $regex
+	",
+			$regex
 		)
 	);
 
@@ -2707,7 +2709,9 @@ function send_confirmation_on_profile_email() {
 	if ( $current_user->user_email != $_POST['email'] ) {
 		if ( ! is_email( $_POST['email'] ) ) {
 			$errors->add(
-				'user_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array(
+				'user_email',
+				__( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ),
+				array(
 					'form-field' => 'email',
 				)
 			);
@@ -2717,7 +2721,9 @@ function send_confirmation_on_profile_email() {
 
 		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
 			$errors->add(
-				'user_email', __( '<strong>ERROR</strong>: The email address is already used.' ), array(
+				'user_email',
+				__( '<strong>ERROR</strong>: The email address is already used.' ),
+				array(
 					'form-field' => 'email',
 				)
 			);
@@ -2940,10 +2946,12 @@ function _wp_privacy_account_request_confirmed( $request_id ) {
 	}
 
 	update_post_meta( $request_id, '_wp_user_request_confirmed_timestamp', time() );
-	wp_update_post( array(
-		'ID'          => $request_id,
-		'post_status' => 'request-confirmed',
-	) );
+	wp_update_post(
+		array(
+			'ID'          => $request_id,
+			'post_status' => 'request-confirmed',
+		)
+	);
 }
 
 /**
@@ -3126,7 +3134,7 @@ function _wp_privacy_send_erasure_fulfillment_notification( $request_id ) {
 		'siteurl'            => home_url(),
 	);
 
-	$subject  = sprintf(
+	$subject = sprintf(
 		/* translators: %s: Site name. */
 		__( '[%s] Erasure Request Fulfilled' ),
 		$email_data['sitename']
@@ -3235,15 +3243,15 @@ All at ###SITENAME###
 function _wp_privacy_account_request_confirmed_message( $request_id ) {
 	$request = wp_get_user_request_data( $request_id );
 
-	$message = '<p class="success">' . __( 'Action has been confirmed.' ) . '</p>';
+	$message  = '<p class="success">' . __( 'Action has been confirmed.' ) . '</p>';
 	$message .= '<p>' . __( 'The site administrator has been notified and will fulfill your request as soon as possible.' ) . '</p>';
 
 	if ( $request && in_array( $request->action_name, _wp_privacy_action_request_types(), true ) ) {
 		if ( 'export_personal_data' === $request->action_name ) {
-			$message = '<p class="success">' . __( 'Thanks for confirming your export request.' ) . '</p>';
+			$message  = '<p class="success">' . __( 'Thanks for confirming your export request.' ) . '</p>';
 			$message .= '<p>' . __( 'The site administrator has been notified. You will receive a link to download your export via email when they fulfill your request.' ) . '</p>';
 		} elseif ( 'remove_personal_data' === $request->action_name ) {
-			$message = '<p class="success">' . __( 'Thanks for confirming your erasure request.' ) . '</p>';
+			$message  = '<p class="success">' . __( 'Thanks for confirming your erasure request.' ) . '</p>';
 			$message .= '<p>' . __( 'The site administrator has been notified. You will receive an email confirmation when they erase your data.' ) . '</p>';
 		}
 	}
@@ -3290,28 +3298,33 @@ function wp_create_user_request( $email_address = '', $action_name = '', $reques
 	$user_id = $user && ! is_wp_error( $user ) ? $user->ID : 0;
 
 	// Check for duplicates.
-	$requests_query = new WP_Query( array(
-		'post_type'     => 'user_request',
-		'post_name__in' => array( $action_name ),  // Action name stored in post_name column.
-		'title'         => $email_address, // Email address stored in post_title column.
-		'post_status'   => 'any',
-		'fields'        => 'ids',
-	) );
+	$requests_query = new WP_Query(
+		array(
+			'post_type'     => 'user_request',
+			'post_name__in' => array( $action_name ),  // Action name stored in post_name column.
+			'title'         => $email_address, // Email address stored in post_title column.
+			'post_status'   => 'any',
+			'fields'        => 'ids',
+		)
+	);
 
 	if ( $requests_query->found_posts ) {
 		return new WP_Error( 'duplicate_request', __( 'A request for this email address already exists.' ) );
 	}
 
-	$request_id = wp_insert_post( array(
-		'post_author'   => $user_id,
-		'post_name'     => $action_name,
-		'post_title'    => $email_address,
-		'post_content'  => wp_json_encode( $request_data ),
-		'post_status'   => 'request-pending',
-		'post_type'     => 'user_request',
-		'post_date'     => current_time( 'mysql', false ),
-		'post_date_gmt' => current_time( 'mysql', true ),
-	), true );
+	$request_id = wp_insert_post(
+		array(
+			'post_author'   => $user_id,
+			'post_name'     => $action_name,
+			'post_title'    => $email_address,
+			'post_content'  => wp_json_encode( $request_data ),
+			'post_status'   => 'request-pending',
+			'post_type'     => 'user_request',
+			'post_date'     => current_time( 'mysql', false ),
+			'post_date_gmt' => current_time( 'mysql', true ),
+		),
+		true
+	);
 
 	return $request_id;
 }
@@ -3380,11 +3393,14 @@ function wp_send_user_request( $request_id ) {
 		'request'     => $request,
 		'email'       => $request->email,
 		'description' => wp_user_request_action_description( $request->action_name ),
-		'confirm_url' => add_query_arg( array(
-			'action'      => 'confirmaction',
-			'request_id'  => $request_id,
-			'confirm_key' => wp_generate_user_request_key( $request_id ),
-		), wp_login_url() ),
+		'confirm_url' => add_query_arg(
+			array(
+				'action'      => 'confirmaction',
+				'request_id'  => $request_id,
+				'confirm_key' => wp_generate_user_request_key( $request_id ),
+			),
+			wp_login_url()
+		),
 		'sitename'    => wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ),
 		'siteurl'     => home_url(),
 	);
@@ -3496,13 +3512,15 @@ function wp_generate_user_request_key( $request_id ) {
 		$wp_hasher = new PasswordHash( 8, true );
 	}
 
-	wp_update_post( array(
-		'ID'                => $request_id,
-		'post_status'       => 'request-pending',
-		'post_password'     => $wp_hasher->HashPassword( $key ),
-		'post_modified'     => current_time( 'mysql', false ),
-		'post_modified_gmt' => current_time( 'mysql', true ),
-	) );
+	wp_update_post(
+		array(
+			'ID'                => $request_id,
+			'post_status'       => 'request-pending',
+			'post_password'     => $wp_hasher->HashPassword( $key ),
+			'post_modified'     => current_time( 'mysql', false ),
+			'post_modified_gmt' => current_time( 'mysql', true ),
+		)
+	);
 
 	return $key;
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 88e63f1788..dbf65123be 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43570';
+$wp_version = '5.0-alpha-43571';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index 467647c320..c8030eb88b 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -681,7 +681,8 @@ function dynamic_sidebar( $index = 1 ) {
 		$params = array_merge(
 			array(
 				array_merge(
-					$sidebar, array(
+					$sidebar,
+					array(
 						'widget_id'   => $id,
 						'widget_name' => $wp_registered_widgets[ $id ]['name'],
 					)
@@ -1573,7 +1574,7 @@ function wp_widget_rss_form( $args, $inputs = null ) {
 
 	$esc_number = esc_attr( $args['number'] );
 	if ( $inputs['url'] ) :
-?>
+		?>
 	<p><label for="rss-url-<?php echo $esc_number; ?>"><?php _e( 'Enter the RSS feed URL here:' ); ?></label>
 	<input class="widefat" id="rss-url-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][url]" type="text" value="<?php echo esc_url( $args['url'] ); ?>" /></p>
 <?php endif; if ( $inputs['title'] ) : ?>
@@ -1597,14 +1598,14 @@ function wp_widget_rss_form( $args, $inputs = null ) {
 <?php endif; if ( $inputs['show_date'] ) : ?>
 	<p><input id="rss-show-date-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_date]" type="checkbox" value="1" <?php checked( $args['show_date'] ); ?>/>
 	<label for="rss-show-date-<?php echo $esc_number; ?>"><?php _e( 'Display item date?' ); ?></label></p>
-<?php
+	<?php
 	endif;
 foreach ( array_keys( $default_inputs ) as $input ) :
 	if ( 'hidden' === $inputs[ $input ] ) :
 		$id = str_replace( '_', '-', $input );
-?>
+		?>
 <input type="hidden" id="rss-<?php echo esc_attr( $id ); ?>-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][<?php echo esc_attr( $input ); ?>]" value="<?php echo esc_attr( $args[ $input ] ); ?>" />
-<?php
+		<?php
 	endif;
 	endforeach;
 }
diff --git a/wp-includes/widgets/class-wp-widget-archives.php b/wp-includes/widgets/class-wp-widget-archives.php
index 56f45654fb..41bc227ab3 100644
--- a/wp-includes/widgets/class-wp-widget-archives.php
+++ b/wp-includes/widgets/class-wp-widget-archives.php
@@ -72,11 +72,13 @@ class WP_Widget_Archives extends WP_Widget {
 			 * @param array $instance Settings for the current Archives widget instance.
 			 */
 			$dropdown_args = apply_filters(
-				'widget_archives_dropdown_args', array(
+				'widget_archives_dropdown_args',
+				array(
 					'type'            => 'monthly',
 					'format'          => 'option',
 					'show_post_count' => $c,
-				), $instance
+				),
+				$instance
 			);
 
 			switch ( $dropdown_args['type'] ) {
@@ -104,29 +106,31 @@ class WP_Widget_Archives extends WP_Widget {
 		</select>
 		<?php } else { ?>
 		<ul>
-		<?php
-		/**
-		 * Filters the arguments for the Archives widget.
-		 *
-		 * @since 2.8.0
-		 * @since 4.9.0 Added the `$instance` parameter.
-		 *
-		 * @see wp_get_archives()
-		 *
-		 * @param array $args     An array of Archives option arguments.
-		 * @param array $instance Array of settings for the current widget.
-		 */
-		wp_get_archives(
-			apply_filters(
-				'widget_archives_args', array(
-					'type'            => 'monthly',
-					'show_post_count' => $c,
-				), $instance
-			)
-		);
-		?>
+			<?php
+			/**
+			 * Filters the arguments for the Archives widget.
+			 *
+			 * @since 2.8.0
+			 * @since 4.9.0 Added the `$instance` parameter.
+			 *
+			 * @see wp_get_archives()
+			 *
+			 * @param array $args     An array of Archives option arguments.
+			 * @param array $instance Array of settings for the current widget.
+			 */
+			wp_get_archives(
+				apply_filters(
+					'widget_archives_args',
+					array(
+						'type'            => 'monthly',
+						'show_post_count' => $c,
+					),
+					$instance
+				)
+			);
+			?>
 		</ul>
-		<?php
+			<?php
 }
 
 		echo $args['after_widget'];
@@ -145,7 +149,8 @@ class WP_Widget_Archives extends WP_Widget {
 	public function update( $new_instance, $old_instance ) {
 		$instance             = $old_instance;
 		$new_instance         = wp_parse_args(
-			(array) $new_instance, array(
+			(array) $new_instance,
+			array(
 				'title'    => '',
 				'count'    => 0,
 				'dropdown' => '',
@@ -167,7 +172,8 @@ class WP_Widget_Archives extends WP_Widget {
 	 */
 	public function form( $instance ) {
 		$instance = wp_parse_args(
-			(array) $instance, array(
+			(array) $instance,
+			array(
 				'title'    => '',
 				'count'    => 0,
 				'dropdown' => '',
diff --git a/wp-includes/widgets/class-wp-widget-categories.php b/wp-includes/widgets/class-wp-widget-categories.php
index 13be3425e1..9cf7a011e3 100644
--- a/wp-includes/widgets/class-wp-widget-categories.php
+++ b/wp-includes/widgets/class-wp-widget-categories.php
@@ -105,26 +105,26 @@ class WP_Widget_Categories extends WP_Widget {
 /* ]]> */
 </script>
 
-<?php
+			<?php
 		} else {
-?>
+			?>
 		<ul>
-<?php
-		$cat_args['title_li'] = '';
+			<?php
+			$cat_args['title_li'] = '';
 
-		/**
-		 * Filters the arguments for the Categories widget.
-		 *
-		 * @since 2.8.0
-		 * @since 4.9.0 Added the `$instance` parameter.
-		 *
-		 * @param array $cat_args An array of Categories widget options.
-		 * @param array $instance Array of settings for the current widget.
-		 */
-		wp_list_categories( apply_filters( 'widget_categories_args', $cat_args, $instance ) );
-?>
+			/**
+			 * Filters the arguments for the Categories widget.
+			 *
+			 * @since 2.8.0
+			 * @since 4.9.0 Added the `$instance` parameter.
+			 *
+			 * @param array $cat_args An array of Categories widget options.
+			 * @param array $instance Array of settings for the current widget.
+			 */
+			wp_list_categories( apply_filters( 'widget_categories_args', $cat_args, $instance ) );
+			?>
 		</ul>
-<?php
+			<?php
 		}
 
 		echo $args['after_widget'];
diff --git a/wp-includes/widgets/class-wp-widget-custom-html.php b/wp-includes/widgets/class-wp-widget-custom-html.php
index 9da1791703..5d2b28a17c 100644
--- a/wp-includes/widgets/class-wp-widget-custom-html.php
+++ b/wp-includes/widgets/class-wp-widget-custom-html.php
@@ -131,7 +131,8 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 
 		// Prepare instance data that looks like a normal Text widget.
 		$simulated_text_widget_instance = array_merge(
-			$instance, array(
+			$instance,
+			array(
 				'text'   => isset( $instance['content'] ) ? $instance['content'] : '',
 				'filter' => false, // Because wpautop is not applied.
 				'visual' => false, // Because it wasn't created in TinyMCE.
diff --git a/wp-includes/widgets/class-wp-widget-links.php b/wp-includes/widgets/class-wp-widget-links.php
index 344bdc5f97..7b2252a5f7 100644
--- a/wp-includes/widgets/class-wp-widget-links.php
+++ b/wp-includes/widgets/class-wp-widget-links.php
@@ -126,7 +126,8 @@ class WP_Widget_Links extends WP_Widget {
 
 		//Defaults
 		$instance  = wp_parse_args(
-			(array) $instance, array(
+			(array) $instance,
+			array(
 				'images'      => true,
 				'name'        => true,
 				'description' => false,
@@ -140,7 +141,7 @@ class WP_Widget_Links extends WP_Widget {
 		if ( ! $limit = intval( $instance['limit'] ) ) {
 			$limit = -1;
 		}
-			?>
+		?>
 		<p>
 		<label for="<?php echo $this->get_field_id( 'category' ); ?>"><?php _e( 'Select Link Category:' ); ?></label>
 		<select class="widefat" id="<?php echo $this->get_field_id( 'category' ); ?>" name="<?php echo $this->get_field_name( 'category' ); ?>">
diff --git a/wp-includes/widgets/class-wp-widget-media-audio.php b/wp-includes/widgets/class-wp-widget-media-audio.php
index 742d248c13..560c6a3a64 100644
--- a/wp-includes/widgets/class-wp-widget-media-audio.php
+++ b/wp-includes/widgets/class-wp-widget-media-audio.php
@@ -23,14 +23,17 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 	 */
 	public function __construct() {
 		parent::__construct(
-			'media_audio', __( 'Audio' ), array(
+			'media_audio',
+			__( 'Audio' ),
+			array(
 				'description' => __( 'Displays an audio player.' ),
 				'mime_type'   => 'audio',
 			)
 		);
 
 		$this->l10n = array_merge(
-			$this->l10n, array(
+			$this->l10n,
+			array(
 				'no_media_selected'          => __( 'No audio selected' ),
 				'add_media'                  => _x( 'Add Audio', 'label for button in the audio widget' ),
 				'replace_media'              => _x( 'Replace Audio', 'label for button in the audio widget; should preferably not be longer than ~13 characters long' ),
diff --git a/wp-includes/widgets/class-wp-widget-media-gallery.php b/wp-includes/widgets/class-wp-widget-media-gallery.php
index d447ea9774..652d8d0723 100644
--- a/wp-includes/widgets/class-wp-widget-media-gallery.php
+++ b/wp-includes/widgets/class-wp-widget-media-gallery.php
@@ -23,14 +23,17 @@ class WP_Widget_Media_Gallery extends WP_Widget_Media {
 	 */
 	public function __construct() {
 		parent::__construct(
-			'media_gallery', __( 'Gallery' ), array(
+			'media_gallery',
+			__( 'Gallery' ),
+			array(
 				'description' => __( 'Displays an image gallery.' ),
 				'mime_type'   => 'image',
 			)
 		);
 
 		$this->l10n = array_merge(
-			$this->l10n, array(
+			$this->l10n,
+			array(
 				'no_media_selected' => __( 'No images selected' ),
 				'add_media'         => _x( 'Add Images', 'label for button in the gallery widget; should not be longer than ~13 characters long' ),
 				'replace_media'     => '',
diff --git a/wp-includes/widgets/class-wp-widget-media-image.php b/wp-includes/widgets/class-wp-widget-media-image.php
index 899b41062d..00b605420a 100644
--- a/wp-includes/widgets/class-wp-widget-media-image.php
+++ b/wp-includes/widgets/class-wp-widget-media-image.php
@@ -23,14 +23,17 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 	 */
 	public function __construct() {
 		parent::__construct(
-			'media_image', __( 'Image' ), array(
+			'media_image',
+			__( 'Image' ),
+			array(
 				'description' => __( 'Displays an image.' ),
 				'mime_type'   => 'image',
 			)
 		);
 
 		$this->l10n = array_merge(
-			$this->l10n, array(
+			$this->l10n,
+			array(
 				'no_media_selected'          => __( 'No image selected' ),
 				'add_media'                  => _x( 'Add Image', 'label for button in the image widget' ),
 				'replace_media'              => _x( 'Replace Image', 'label for button in the image widget; should preferably not be longer than ~13 characters long' ),
@@ -173,7 +176,8 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 	public function render_media( $instance ) {
 		$instance = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance );
 		$instance = wp_parse_args(
-			$instance, array(
+			$instance,
+			array(
 				'size' => 'thumbnail',
 			)
 		);
@@ -270,7 +274,8 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 				array(
 					'width'   => $width,
 					'caption' => $caption,
-				), $image
+				),
+				$image
 			);
 		}
 
diff --git a/wp-includes/widgets/class-wp-widget-media-video.php b/wp-includes/widgets/class-wp-widget-media-video.php
index 9d9235bd00..0be31a61ab 100644
--- a/wp-includes/widgets/class-wp-widget-media-video.php
+++ b/wp-includes/widgets/class-wp-widget-media-video.php
@@ -23,14 +23,17 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 	 */
 	public function __construct() {
 		parent::__construct(
-			'media_video', __( 'Video' ), array(
+			'media_video',
+			__( 'Video' ),
+			array(
 				'description' => __( 'Displays a video from the media library or from YouTube, Vimeo, or another provider.' ),
 				'mime_type'   => 'video',
 			)
 		);
 
 		$this->l10n = array_merge(
-			$this->l10n, array(
+			$this->l10n,
+			array(
 				'no_media_selected'          => __( 'No video selected' ),
 				'add_media'                  => _x( 'Add Video', 'label for button in the video widget' ),
 				'replace_media'              => _x( 'Replace Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ),
diff --git a/wp-includes/widgets/class-wp-widget-media.php b/wp-includes/widgets/class-wp-widget-media.php
index b4d3631b93..0c3b599e54 100644
--- a/wp-includes/widgets/class-wp-widget-media.php
+++ b/wp-includes/widgets/class-wp-widget-media.php
@@ -55,7 +55,8 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 */
 	public function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
 		$widget_opts = wp_parse_args(
-			$widget_options, array(
+			$widget_options,
+			array(
 				'description'                 => __( 'A media item.' ),
 				'customize_selective_refresh' => true,
 				'mime_type'                   => '',
@@ -80,7 +81,7 @@ abstract class WP_Widget_Media extends WP_Widget {
 			'media_library_state_single' => __( 'Media Widget' ),
 			'unsupported_file_type'      => __( 'Looks like this isn&#8217;t the correct kind of file. Please link to an appropriate file instead.' ),
 		);
-		$this->l10n = array_merge( $l10n_defaults, array_filter( $this->l10n ) );
+		$this->l10n    = array_merge( $l10n_defaults, array_filter( $this->l10n ) );
 
 		parent::__construct(
 			$id_base,
@@ -338,7 +339,7 @@ abstract class WP_Widget_Media extends WP_Widget {
 				id="<?php echo esc_attr( $this->get_field_id( $name ) ); // Needed specifically by wpWidgets.appendTitle(). ?>"
 				value="<?php echo esc_attr( is_array( $value ) ? join( ',', $value ) : strval( $value ) ); ?>"
 			/>
-		<?php
+			<?php
 		endforeach;
 	}
 
diff --git a/wp-includes/widgets/class-wp-widget-meta.php b/wp-includes/widgets/class-wp-widget-meta.php
index 2df1f7030d..c02fbeb41f 100644
--- a/wp-includes/widgets/class-wp-widget-meta.php
+++ b/wp-includes/widgets/class-wp-widget-meta.php
@@ -52,7 +52,7 @@ class WP_Widget_Meta extends WP_Widget {
 		if ( $title ) {
 			echo $args['before_title'] . $title . $args['after_title'];
 		}
-			?>
+		?>
 			<ul>
 			<?php wp_register(); ?>
 			<li><?php wp_loginout(); ?></li>
@@ -69,12 +69,14 @@ class WP_Widget_Meta extends WP_Widget {
 			 * @param array  $instance   Array of settings for the current widget.
 			 */
 			echo apply_filters(
-				'widget_meta_poweredby', sprintf(
+				'widget_meta_poweredby',
+				sprintf(
 					'<li><a href="%s" title="%s">%s</a></li>',
 					esc_url( __( 'https://wordpress.org/' ) ),
 					esc_attr__( 'Powered by WordPress, state-of-the-art semantic personal publishing platform.' ),
 					_x( 'WordPress.org', 'meta widget link text' )
-				), $instance
+				),
+				$instance
 			);
 
 			wp_meta();
@@ -112,8 +114,8 @@ class WP_Widget_Meta extends WP_Widget {
 	public function form( $instance ) {
 		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
 		$title    = sanitize_text_field( $instance['title'] );
-?>
+		?>
 			<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
-<?php
+		<?php
 	}
 }
diff --git a/wp-includes/widgets/class-wp-widget-pages.php b/wp-includes/widgets/class-wp-widget-pages.php
index 025a0039c4..43ab8e4717 100644
--- a/wp-includes/widgets/class-wp-widget-pages.php
+++ b/wp-includes/widgets/class-wp-widget-pages.php
@@ -73,12 +73,14 @@ class WP_Widget_Pages extends WP_Widget {
 		 */
 		$out = wp_list_pages(
 			apply_filters(
-				'widget_pages_args', array(
+				'widget_pages_args',
+				array(
 					'title_li'    => '',
 					'echo'        => 0,
 					'sort_column' => $sortby,
 					'exclude'     => $exclude,
-				), $instance
+				),
+				$instance
 			)
 		);
 
@@ -87,11 +89,11 @@ class WP_Widget_Pages extends WP_Widget {
 			if ( $title ) {
 				echo $args['before_title'] . $title . $args['after_title'];
 			}
-		?>
+			?>
 		<ul>
 			<?php echo $out; ?>
 		</ul>
-		<?php
+			<?php
 			echo $args['after_widget'];
 		}
 	}
@@ -130,7 +132,8 @@ class WP_Widget_Pages extends WP_Widget {
 	public function form( $instance ) {
 		//Defaults
 		$instance = wp_parse_args(
-			(array) $instance, array(
+			(array) $instance,
+			array(
 				'sortby'  => 'post_title',
 				'title'   => '',
 				'exclude' => '',
diff --git a/wp-includes/widgets/class-wp-widget-recent-comments.php b/wp-includes/widgets/class-wp-widget-recent-comments.php
index c7b0c264bd..99330a4991 100644
--- a/wp-includes/widgets/class-wp-widget-recent-comments.php
+++ b/wp-includes/widgets/class-wp-widget-recent-comments.php
@@ -97,11 +97,13 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 		 */
 		$comments = get_comments(
 			apply_filters(
-				'widget_comments_args', array(
+				'widget_comments_args',
+				array(
 					'number'      => $number,
 					'status'      => 'approve',
 					'post_status' => 'publish',
-				), $instance
+				),
+				$instance
 			)
 		);
 
diff --git a/wp-includes/widgets/class-wp-widget-recent-posts.php b/wp-includes/widgets/class-wp-widget-recent-posts.php
index fa0f56ac2d..c137849557 100644
--- a/wp-includes/widgets/class-wp-widget-recent-posts.php
+++ b/wp-includes/widgets/class-wp-widget-recent-posts.php
@@ -69,12 +69,14 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 		 */
 		$r = new WP_Query(
 			apply_filters(
-				'widget_posts_args', array(
+				'widget_posts_args',
+				array(
 					'posts_per_page'      => $number,
 					'no_found_rows'       => true,
 					'post_status'         => 'publish',
 					'ignore_sticky_posts' => true,
-				), $instance
+				),
+				$instance
 			)
 		);
 
@@ -135,7 +137,7 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 		$title     = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
 		$number    = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
 		$show_date = isset( $instance['show_date'] ) ? (bool) $instance['show_date'] : false;
-?>
+		?>
 		<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
 		<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></p>
 
@@ -144,6 +146,6 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 
 		<p><input class="checkbox" type="checkbox"<?php checked( $show_date ); ?> id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" />
 		<label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Display post date?' ); ?></label></p>
-<?php
+		<?php
 	}
 }
diff --git a/wp-includes/widgets/class-wp-widget-tag-cloud.php b/wp-includes/widgets/class-wp-widget-tag-cloud.php
index e04631543f..01ce7e4753 100644
--- a/wp-includes/widgets/class-wp-widget-tag-cloud.php
+++ b/wp-includes/widgets/class-wp-widget-tag-cloud.php
@@ -68,11 +68,13 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 		 */
 		$tag_cloud = wp_tag_cloud(
 			apply_filters(
-				'widget_tag_cloud_args', array(
+				'widget_tag_cloud_args',
+				array(
 					'taxonomy'   => $current_taxonomy,
 					'echo'       => false,
 					'show_count' => $show_count,
-				), $instance
+				),
+				$instance
 			)
 		);
 
diff --git a/wp-includes/widgets/class-wp-widget-text.php b/wp-includes/widgets/class-wp-widget-text.php
index 36b05b3730..2295650e3c 100644
--- a/wp-includes/widgets/class-wp-widget-text.php
+++ b/wp-includes/widgets/class-wp-widget-text.php
@@ -358,7 +358,8 @@ class WP_Widget_Text extends WP_Widget {
 	 */
 	public function update( $new_instance, $old_instance ) {
 		$new_instance = wp_parse_args(
-			$new_instance, array(
+			$new_instance,
+			array(
 				'title'  => '',
 				'text'   => '',
 				'filter' => false, // For back-compat.
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index e170ffe959..ae08158f64 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -3217,7 +3217,9 @@ class wpdb {
 				. '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?'
 				. '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
 				. '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:.+?FROM)?'
-			. ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe
+			. ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is',
+			$query,
+			$maybe
 		) ) {
 			return str_replace( '`', '', $maybe[1] );
 		}
@@ -3252,7 +3254,9 @@ class wpdb {
 				. '|LOAD\s+DATA.*INFILE.*INTO\s+TABLE'
 				. '|(?:GRANT|REVOKE).*ON\s+TABLE'
 				. '|SHOW\s+(?:.*FROM|.*TABLE)'
-			. ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe
+			. ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is',
+			$query,
+			$maybe
 		) ) {
 			return str_replace( '`', '', $maybe[1] );
 		}
diff --git a/wp-links-opml.php b/wp-links-opml.php
index 218c1f52a3..c64a5c036e 100644
--- a/wp-links-opml.php
+++ b/wp-links-opml.php
@@ -72,31 +72,31 @@ foreach ( (array) $cats as $cat ) :
 	 */
 	$catname = apply_filters( 'link_category', $cat->name );
 
-?>
+	?>
 <outline type="category" title="<?php echo esc_attr( $catname ); ?>">
-<?php
+	<?php
 	$bookmarks = get_bookmarks( array( 'category' => $cat->term_id ) );
-foreach ( (array) $bookmarks as $bookmark ) :
-	/**
-	 * Filters the OPML outline link title text.
-	 *
-	 * @since 2.2.0
-	 *
-	 * @param string $title The OPML outline title text.
-	 */
-	$title = apply_filters( 'link_title', $bookmark->link_name );
-?>
+	foreach ( (array) $bookmarks as $bookmark ) :
+		/**
+		 * Filters the OPML outline link title text.
+		 *
+		 * @since 2.2.0
+		 *
+		 * @param string $title The OPML outline title text.
+		 */
+		$title = apply_filters( 'link_title', $bookmark->link_name );
+		?>
 <outline text="<?php echo esc_attr( $title ); ?>" type="link" xmlUrl="<?php echo esc_attr( $bookmark->link_rss ); ?>" htmlUrl="<?php echo esc_attr( $bookmark->link_url ); ?>" updated="
 							<?php
 							if ( '0000-00-00 00:00:00' != $bookmark->link_updated ) {
 								echo $bookmark->link_updated;}
-?>
+							?>
 " />
-<?php
+		<?php
 	endforeach; // $bookmarks
-?>
+	?>
 </outline>
-<?php
+	<?php
 endforeach; // $cats
 ?>
 </body>
diff --git a/wp-login.php b/wp-login.php
index 96b2eb86cf..745dbc343a 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -254,14 +254,14 @@ function login_footer( $input_id = '' ) {
 
 	// Don't allow interim logins to navigate away from the page.
 	if ( ! $interim_login ) :
-	?>
+		?>
 	<p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>">
-	<?php
+		<?php
 		/* translators: %s: site title */
 		printf( _x( '&larr; Back to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
-	?>
+		?>
 	</a></p>
-	<?php the_privacy_policy_link( '<div class="privacy-policy-page-link">', '</div>' ); ?>
+		<?php the_privacy_policy_link( '<div class="privacy-policy-page-link">', '</div>' ); ?>
 	<?php endif; ?>
 
 	</div>
@@ -291,7 +291,7 @@ function login_footer( $input_id = '' ) {
  * @since 3.0.0
  */
 function wp_shake_js() {
-?>
+	?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 function s(id,pos){g(id).left=pos+'px';}
@@ -299,7 +299,7 @@ function g(id){return document.getElementById(id).style;}
 function shake(id,a,d){c=a.shift();s(id,c);if(a.length>0){setTimeout(function(){shake(id,a,d);},d);}else{try{g(id).position='static';wp_attempt_focus();}catch(e){}}}
 addLoadEvent(function(){ var p=new Array(15,30,15,0,-15,-30,-15,0);p=p.concat(p.concat(p));var i=document.forms[0].id;g(i).position='relative';shake(i,p,20);});
 </script>
-<?php
+	<?php
 }
 
 /**
@@ -603,45 +603,45 @@ switch ( $action ) {
 			$user_login = wp_unslash( $_POST['user_login'] );
 		}
 
-	?>
+		?>
 
 	<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
 	<p>
 		<label for="user_login" ><?php _e( 'Username or Email Address' ); ?><br />
 		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" /></label>
 	</p>
-	<?php
-	/**
-	 * Fires inside the lostpassword form tags, before the hidden fields.
-	 *
-	 * @since 2.1.0
-	 */
-	do_action( 'lostpassword_form' );
-	?>
+		<?php
+		/**
+		 * Fires inside the lostpassword form tags, before the hidden fields.
+		 *
+		 * @since 2.1.0
+		 */
+		do_action( 'lostpassword_form' );
+		?>
 		<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
 		<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Get New Password' ); ?>" /></p>
 	</form>
 
 	<p id="nav">
 	<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
-	<?php
-	if ( get_option( 'users_can_register' ) ) :
-		$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+		<?php
+		if ( get_option( 'users_can_register' ) ) :
+			$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
 
-		echo esc_html( $login_link_separator );
+			echo esc_html( $login_link_separator );
 
-		/** This filter is documented in wp-includes/general-template.php */
-		echo apply_filters( 'register', $registration_url );
+			/** This filter is documented in wp-includes/general-template.php */
+			echo apply_filters( 'register', $registration_url );
 	endif;
-	?>
+		?>
 	</p>
 
-	<?php
-	login_footer( 'user_login' );
+		<?php
+		login_footer( 'user_login' );
 
-	if ( $switched_locale ) {
-		restore_previous_locale();
-	}
+		if ( $switched_locale ) {
+			restore_previous_locale();
+		}
 
 		break;
 
@@ -705,7 +705,7 @@ switch ( $action ) {
 
 		login_header( __( 'Reset Password' ), '<p class="message reset-pass">' . __( 'Enter your new password below.' ) . '</p>', $errors );
 
-	?>
+		?>
 	<form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
 	<input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
 
@@ -739,40 +739,40 @@ switch ( $action ) {
 	<p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
 	<br class="clear" />
 
-	<?php
-	/**
-	 * Fires following the 'Strength indicator' meter in the user password reset form.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param WP_User $user User object of the user whose password is being reset.
-	 */
-	do_action( 'resetpass_form', $user );
-	?>
+		<?php
+		/**
+		 * Fires following the 'Strength indicator' meter in the user password reset form.
+		 *
+		 * @since 3.9.0
+		 *
+		 * @param WP_User $user User object of the user whose password is being reset.
+		 */
+		do_action( 'resetpass_form', $user );
+		?>
 	<input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" />
 	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Reset Password' ); ?>" /></p>
 	</form>
 
 	<p id="nav">
 	<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
-	<?php
-	if ( get_option( 'users_can_register' ) ) :
-		$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+		<?php
+		if ( get_option( 'users_can_register' ) ) :
+			$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
 
-		echo esc_html( $login_link_separator );
+			echo esc_html( $login_link_separator );
 
-		/** This filter is documented in wp-includes/general-template.php */
-		echo apply_filters( 'register', $registration_url );
+			/** This filter is documented in wp-includes/general-template.php */
+			echo apply_filters( 'register', $registration_url );
 	endif;
-	?>
+		?>
 	</p>
 
-	<?php
-	login_footer( 'user_pass' );
+		<?php
+		login_footer( 'user_pass' );
 
-	if ( $switched_locale ) {
-		restore_previous_locale();
-	}
+		if ( $switched_locale ) {
+			restore_previous_locale();
+		}
 
 		break;
 
@@ -824,7 +824,7 @@ switch ( $action ) {
 		 */
 		$redirect_to = apply_filters( 'registration_redirect', $registration_redirect );
 		login_header( __( 'Registration Form' ), '<p class="message register">' . __( 'Register For This Site' ) . '</p>', $errors );
-	?>
+		?>
 	<form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate">
 	<p>
 		<label for="user_login"><?php _e( 'Username' ); ?><br />
@@ -834,14 +834,14 @@ switch ( $action ) {
 		<label for="user_email"><?php _e( 'Email' ); ?><br />
 		<input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
 	</p>
-	<?php
-	/**
-	 * Fires following the 'Email' field in the user registration form.
-	 *
-	 * @since 2.1.0
-	 */
-	do_action( 'register_form' );
-	?>
+		<?php
+		/**
+		 * Fires following the 'Email' field in the user registration form.
+		 *
+		 * @since 2.1.0
+		 */
+		do_action( 'register_form' );
+		?>
 	<p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed to you.' ); ?></p>
 	<br class="clear" />
 	<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
@@ -850,20 +850,20 @@ switch ( $action ) {
 
 	<p id="nav">
 	<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
-	<?php echo esc_html( $login_link_separator ); ?>
+		<?php echo esc_html( $login_link_separator ); ?>
 	<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
 	</p>
 
-	<?php
-	login_footer( 'user_login' );
+		<?php
+		login_footer( 'user_login' );
 
-	if ( $switched_locale ) {
-		restore_previous_locale();
-	}
+		if ( $switched_locale ) {
+			restore_previous_locale();
+		}
 
 		break;
 
-	case 'confirmaction' :
+	case 'confirmaction':
 		if ( ! isset( $_GET['request_id'] ) ) {
 			wp_die( __( 'Invalid request.' ) );
 		}
@@ -943,16 +943,19 @@ switch ( $action ) {
 			if ( headers_sent() ) {
 				/* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
 				$user = new WP_Error(
-					'test_cookie', sprintf(
+					'test_cookie',
+					sprintf(
 						__( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
-						__( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' )
+						__( 'https://codex.wordpress.org/Cookies' ),
+						__( 'https://wordpress.org/support/' )
 					)
 				);
 			} elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
 				// If cookies are disabled we can't log in even with a valid user+pass
 				/* translators: %s: Browser cookie documentation URL */
 				$user = new WP_Error(
-					'test_cookie', sprintf(
+					'test_cookie',
+					sprintf(
 						__( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
 						__( 'https://codex.wordpress.org/Cookies' )
 					)
@@ -977,18 +980,18 @@ switch ( $action ) {
 				$message       = '<p class="message">' . __( 'You have logged in successfully.' ) . '</p>';
 				$interim_login = 'success';
 				login_header( '', $message );
-			?>
+				?>
 				</div>
 				<?php
 				/** This action is documented in wp-login.php */
 				do_action( 'login_footer' );
-			?>
+				?>
 				<?php if ( $customize_login ) : ?>
 				<script type="text/javascript">setTimeout( function(){ new wp.customize.Messenger({ url: '<?php echo wp_customize_url(); ?>', channel: 'login' }).send('login') }, 1000 );</script>
 			<?php endif; ?>
 				</body></html>
-	<?php
-	  exit;
+				<?php
+				exit;
 			}
 
 			if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
@@ -1062,7 +1065,7 @@ switch ( $action ) {
 		} else {
 			$aria_describedby_error = '';
 		}
-	?>
+		?>
 
 	<form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
 	<p>
@@ -1073,51 +1076,51 @@ switch ( $action ) {
 		<label for="user_pass"><?php _e( 'Password' ); ?><br />
 		<input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label>
 	</p>
-	<?php
-	/**
-	 * Fires following the 'Password' field in the login form.
-	 *
-	 * @since 2.1.0
-	 */
-	do_action( 'login_form' );
-	?>
+		<?php
+		/**
+		 * Fires following the 'Password' field in the login form.
+		 *
+		 * @since 2.1.0
+		 */
+		do_action( 'login_form' );
+		?>
 	<p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_html_e( 'Remember Me' ); ?></label></p>
 	<p class="submit">
 		<input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Log In' ); ?>" />
-	<?php	if ( $interim_login ) { ?>
+		<?php	if ( $interim_login ) { ?>
 		<input type="hidden" name="interim-login" value="1" />
 	<?php	} else { ?>
 		<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
 	<?php } ?>
-	<?php if ( $customize_login ) : ?>
+		<?php if ( $customize_login ) : ?>
 		<input type="hidden" name="customize-login" value="1" />
 	<?php endif; ?>
 		<input type="hidden" name="testcookie" value="1" />
 	</p>
 	</form>
 
-	<?php if ( ! $interim_login ) { ?>
+		<?php if ( ! $interim_login ) { ?>
 	<p id="nav">
-	<?php
-	if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) :
-		if ( get_option( 'users_can_register' ) ) :
-			$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+			<?php
+			if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) :
+				if ( get_option( 'users_can_register' ) ) :
+					$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
 
-			/** This filter is documented in wp-includes/general-template.php */
-			echo apply_filters( 'register', $registration_url );
+					/** This filter is documented in wp-includes/general-template.php */
+					echo apply_filters( 'register', $registration_url );
 
-			echo esc_html( $login_link_separator );
-		endif;
-		?>
+					echo esc_html( $login_link_separator );
+				endif;
+				?>
 		<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
-	<?php endif; ?>
+			<?php endif; ?>
 	</p>
 	<?php } ?>
 
 	<script type="text/javascript">
 	function wp_attempt_focus(){
 	setTimeout( function(){ try{
-	<?php if ( $user_login ) { ?>
+		<?php if ( $user_login ) { ?>
 	d = document.getElementById('user_pass');
 	d.value = '';
 	<?php } else { ?>
@@ -1125,7 +1128,7 @@ switch ( $action ) {
 	<?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
 	if( d.value != '' )
 	d.value = '';
-	<?php
+		<?php
 }
 }
 ?>
@@ -1135,20 +1138,20 @@ switch ( $action ) {
 	}, 200);
 	}
 
-	<?php
-	/**
-	 * Filters whether to print the call to `wp_attempt_focus()` on the login screen.
-	 *
-	 * @since 4.8.0
-	 *
-	 * @param bool $print Whether to print the function call. Default true.
-	 */
-	if ( apply_filters( 'enable_login_autofocus', true ) && ! $error ) {
-?>
+		<?php
+		/**
+		 * Filters whether to print the call to `wp_attempt_focus()` on the login screen.
+		 *
+		 * @since 4.8.0
+		 *
+		 * @param bool $print Whether to print the function call. Default true.
+		 */
+		if ( apply_filters( 'enable_login_autofocus', true ) && ! $error ) {
+			?>
 	wp_attempt_focus();
-	<?php } ?>
+		<?php } ?>
 	if(typeof wpOnload=='function')wpOnload();
-	<?php if ( $interim_login ) { ?>
+		<?php if ( $interim_login ) { ?>
 	(function(){
 	try {
 		var i, links = document.getElementsByTagName('a');
@@ -1161,12 +1164,12 @@ switch ( $action ) {
 	<?php } ?>
 	</script>
 
-	<?php
-	login_footer();
+		<?php
+		login_footer();
 
-	if ( $switched_locale ) {
-		restore_previous_locale();
-	}
+		if ( $switched_locale ) {
+			restore_previous_locale();
+		}
 
 		break;
 } // end action switch
diff --git a/wp-signup.php b/wp-signup.php
index 3a424743bf..2e1fe05f56 100644
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -111,9 +111,9 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 	}
 
 	if ( $errmsg = $errors->get_error_message( 'blogname' ) ) {
-	?>
+		?>
 		<p class="error"><?php echo $errmsg; ?></p>
-	<?php
+		<?php
 	}
 
 	if ( ! is_subdomain_install() ) {
@@ -138,10 +138,10 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 	<label for="blog_title"><?php _e( 'Site Title:' ); ?></label>
 	<?php if ( $errmsg = $errors->get_error_message( 'blog_title' ) ) { ?>
 		<p class="error"><?php echo $errmsg; ?></p>
-	<?php
+		<?php
 }
 	echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_attr( $blog_title ) . '" />';
-	?>
+?>
 
 	<?php
 	// Site Language.
@@ -175,7 +175,7 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 			);
 			?>
 		</p>
-	<?php
+		<?php
 		endif; // Languages.
 
 		$blog_public_on_checked = $blog_public_off_checked = '';
@@ -334,7 +334,7 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
 	<?php
 	$blogs = get_blogs_of_user( $current_user->ID );
 	if ( ! empty( $blogs ) ) {
-	?>
+		?>
 
 			<p><?php _e( 'Sites you are already a member of:' ); ?></p>
 			<ul>
diff --git a/xmlrpc.php b/xmlrpc.php
index 5efe137527..d0158ee2e7 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -56,8 +56,8 @@ if ( isset( $_GET['rsd'] ) ) { // http://cyber.law.harvard.edu/blogs/gems/tech/r
 		</apis>
 	</service>
 </rsd>
-<?php
-exit;
+	<?php
+	exit;
 }
 
 include_once( ABSPATH . 'wp-admin/includes/admin.php' );